diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-17 19:47:05 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 19:47:05 -0700 |
| commit | 9797dd2edc65e1b0bd2a428ea01ab712163e78d7 (patch) | |
| tree | 576d68f0e8e638bad8935acb9b7ae8bcfc4006f4 /java/src | |
| parent | 333bb7dbbddaca55372322ff3c044222d385a08f (diff) | |
| parent | 2fd4a00bea92a6b54cc21999c8f147e1baed1393 (diff) | |
| download | latinime-9797dd2edc65e1b0bd2a428ea01ab712163e78d7.tar.gz latinime-9797dd2edc65e1b0bd2a428ea01ab712163e78d7.tar.xz latinime-9797dd2edc65e1b0bd2a428ea01ab712163e78d7.zip | |
am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier key while sliding key input"
* commit '2fd4a00bea92a6b54cc21999c8f147e1baed1393':
Ignore modifier key while sliding key input
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index 2ec6e2049..91c4319e7 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -444,7 +444,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { if (sInGesture || mIsDetectingGesture) { return false; } - final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier(); + final boolean ignoreModifierKey = mIsInSlidingKeyInput && key.isModifier(); if (DEBUG_LISTENER) { Log.d(TAG, String.format("[%d] onPress : %s%s%s", mPointerId, KeyDetector.printableCode(key), @@ -468,7 +468,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { // primaryCode is different from {@link Key#mCode}. private void callListenerOnCodeInput(final Key key, final int primaryCode, final int x, final int y, final long eventTime) { - final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier(); + final boolean ignoreModifierKey = mIsInSlidingKeyInput && key.isModifier(); final boolean altersCode = key.altCodeWhileTyping() && mTimerProxy.isTypingState(); final int code = altersCode ? key.getAltCode() : primaryCode; if (DEBUG_LISTENER) { @@ -503,7 +503,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { if (sInGesture || mIsDetectingGesture) { return; } - final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier(); + final boolean ignoreModifierKey = mIsInSlidingKeyInput && key.isModifier(); if (DEBUG_LISTENER) { Log.d(TAG, String.format("[%d] onRelease : %s%s%s%s", mPointerId, Constants.printableCode(primaryCode), |