commit 28772899d2fd0f452d1beca79c03123eaee53c0f
author Tadashi G. Takaoka <takaoka@google.com> Wed Jan 09 00:26:11 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 09 00:26:12 2013 -0800
tree a27353cbde28a056c8794d5945b32bc297c0ab68
parent 8f5f79d7ea824752dcaa4e035e71291e7dd7ddaf
parent 8353e751cae4a26d186fb645e9d3d40e1bc5d14b

Merge "Don't cancel gesture typing while more keys keyboard is shown"

java/src/com/android/inputmethod/keyboard/PointerTracker.java

diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 59a3c99..1ee87be 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -791,6 +791,7 @@
 
     private void cancelBatchInput() {
         sPointerTrackerQueue.cancelAllPointerTracker();
+        mIsDetectingGesture = false;
         if (!sInGesture) {
             return;
         }
@@ -918,6 +919,7 @@
         if (mIsDetectingGesture) {
             final boolean onValidArea = mGestureStrokeWithPreviewPoints.addPointOnKeyboard(
                     x, y, gestureTime, isMajorEvent);
+            // If the move event goes out from valid batch input area, cancel batch input.
             if (!onValidArea) {
                 cancelBatchInput();
                 return;
@@ -1196,6 +1198,9 @@
 
     @Override
     public void cancelTracking() {
+        if (isShowingMoreKeysPanel()) {
+            return;
+        }
         mIsTrackingCanceled = true;
     }