| Chunk |
|---|
| Conflicting content |
|---|
KeyEvent ke = (KeyEvent)ev.event;
if (ke.isDown()) {
lastKeyTime = curTime;
<<<<<<< HEAD
nextKeyTime = lastKeyTime
+ ViewConfiguration.getLongPressTimeout();
if (DEBUG_INPUT) Slog.v(
TAG, "Received key down: first repeat @ "
+ nextKeyTime);
=======
if (lastKey != null &&
ke.getKeyCode() == lastKey.getKeyCode()) {
keyRepeatCount++;
// Arbitrary long timeout to block
// repeating here since we know that
// the device driver takes care of it.
nextKeyTime = lastKeyTime + LONG_WAIT;
if (DEBUG_INPUT) Log.v(
TAG, "Received repeated key down");
} else {
downTime = curTime;
keyRepeatCount = 0;
nextKeyTime = lastKeyTime
+ ViewConfiguration.getLongPressTimeout();
if (DEBUG_INPUT) Log.v(
TAG, "Received key down: first repeat @ "
+ nextKeyTime);
}
lastKey = ke;
>>>>>>> 133bfdfa4a89f40f15371e99904639ff5db7759a
} else {
lastKey = null;
downTime = 0; |
| Solution content |
|---|
KeyEvent ke = (KeyEvent)ev.event;
if (ke.isDown()) {
lastKeyTime = curTime;
if (lastKey != null &&
ke.getKeyCode() == lastKey.getKeyCode()) {
keyRepeatCount++;
// Arbitrary long timeout to block
// repeating here since we know that
// the device driver takes care of it.
nextKeyTime = lastKeyTime + LONG_WAIT;
if (DEBUG_INPUT) Slog.v(
TAG, "Received repeated key down");
} else {
downTime = curTime;
keyRepeatCount = 0;
nextKeyTime = lastKeyTime
+ ViewConfiguration.getLongPressTimeout();
if (DEBUG_INPUT) Slog.v(
TAG, "Received key down: first repeat @ "
+ nextKeyTime);
}
lastKey = ke;
} else {
lastKey = null;
downTime = 0; |
| File |
|---|
| WindowManagerService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |