commit 9d42353611d77be82316c79fe598d101639c2486
author Tadashi G. Takaoka <takaoka@google.com> Thu Oct 11 00:46:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 11 00:46:06 2012 -0700
tree cdc63d393884e112146934c36f85a0878eb3a6e7
parent 7c8f4a04fae1de047e520825cc2a22e5eb3a8f2e
parent c9ba26994b946d35c375cd1cd9a6db2b23b3de7e

Merge "Don't cancel long press timer too early" into jb-mr1-dev

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 3610533..291b658 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -836,13 +836,11 @@
             // Register move event on gesture tracker.
             onGestureMoveEvent(x, y, eventTime, true /* isMajorEvent */, key);
             if (sInGesture) {
+                mTimerProxy.cancelLongPressTimer();
                 mCurrentKey = null;
                 setReleasedKeyGraphics(oldKey);
                 return;
             }
-            if (mGestureStrokeWithPreviewPoints.hasDetectedFastMove()) {
-                mTimerProxy.cancelLongPressTimer();
-            }
         }
 
         if (key != null) {

java/src/com/android/inputmethod/keyboard/internal/GestureStroke.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureStroke.java b/java/src/com/android/inputmethod/keyboard/internal/GestureStroke.java
index c406f0c..f8244dd 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureStroke.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/GestureStroke.java
@@ -243,7 +243,7 @@
         mLastMajorEventY = y;
     }
 
-    public final boolean hasDetectedFastMove() {
+    private final boolean hasDetectedFastMove() {
         return mDetectFastMoveTime > 0;
     }