diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-12-20 21:37:46 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-12-20 21:37:46 -0800 |
| commit | c366ea036bc59c82ff2bd3c1532cb2ea649d201c (patch) | |
| tree | 8d377c644e40a852a342d3dbe0214277d22a2370 /java | |
| parent | 8292c97394e78e469c9ee090eeacfa3b3faabb58 (diff) | |
| parent | 7c1e853387f71235fd0bd8051246f7a95be5ed53 (diff) | |
| download | latinime-c366ea036bc59c82ff2bd3c1532cb2ea649d201c.tar.gz latinime-c366ea036bc59c82ff2bd3c1532cb2ea649d201c.tar.xz latinime-c366ea036bc59c82ff2bd3c1532cb2ea649d201c.zip | |
am 7c1e8533: Call onCancelBatchInput only when onStartBatchInput has been called
* commit '7c1e853387f71235fd0bd8051246f7a95be5ed53':
Call onCancelBatchInput only when onStartBatchInput has been called
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index 0f55607a0..59a3c99aa 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -791,6 +791,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element { private void cancelBatchInput() { sPointerTrackerQueue.cancelAllPointerTracker(); + if (!sInGesture) { + return; + } sInGesture = false; if (DEBUG_LISTENER) { Log.d(TAG, String.format("[%d] onCancelBatchInput", mPointerId)); @@ -1208,9 +1211,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { printTouchEvent("onCancelEvt:", x, y, eventTime); } - if (sInGesture) { - cancelBatchInput(); - } + cancelBatchInput(); sPointerTrackerQueue.cancelAllPointerTracker(); sPointerTrackerQueue.releaseAllPointers(eventTime); onCancelEventInternal(); |