diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-14 23:20:52 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-14 23:20:52 -0700 |
| commit | eabb710b60c50b58a105bf9cbb6c7987ccdae6ee (patch) | |
| tree | 6df6bd8f7d38b836940d6765e6a0981cc05b285f /java/src | |
| parent | 089f1ce95467e279c1d0b9f53de603af6a685bc4 (diff) | |
| parent | f224941c37a04d3c290ef2db5003a5af2a701fce (diff) | |
| download | latinime-eabb710b60c50b58a105bf9cbb6c7987ccdae6ee.tar.gz latinime-eabb710b60c50b58a105bf9cbb6c7987ccdae6ee.tar.xz latinime-eabb710b60c50b58a105bf9cbb6c7987ccdae6ee.zip | |
am f224941c: Merge "Suppress calling onPressKey and onReleaseKey while detecting gesture"
* commit 'f224941c37a04d3c290ef2db5003a5af2a701fce':
Suppress calling onPressKey and onReleaseKey while detecting gesture
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index dcfae739e..2ec6e2049 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -441,7 +441,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { // Returns true if keyboard has been changed by this callback. private boolean callListenerOnPressAndCheckKeyboardLayoutChange(final Key key) { - if (sInGesture) { + if (sInGesture || mIsDetectingGesture) { return false; } final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier(); @@ -500,7 +500,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { // primaryCode is different from {@link Key#mCode}. private void callListenerOnRelease(final Key key, final int primaryCode, final boolean withSliding) { - if (sInGesture) { + if (sInGesture || mIsDetectingGesture) { return; } final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier(); |