commit 8aaab7c2867414f53228aa4faa2b8751105ac6dd
author Tadashi G. Takaoka <takaoka@google.com> Tue Nov 09 11:57:41 2010 -0800
committer Tadashi G. Takaoka <takaoka@google.com> Wed Nov 10 15:27:24 2010 -0800
tree 1d3e79cd02ff54430c17d5ee30875dbf3b4539c4
parent f8e30a91537b8b4920887d0d4f0771de3a23c4cb

Should cancel both normal and shift long press timers

Bug: 3132881

Change-Id: Ib89e2efa4e68e7d57ac1123df2ec6241f1b902d1

java/src/com/android/inputmethod/latin/BaseKeyboardView.java

diff --git a/java/src/com/android/inputmethod/latin/BaseKeyboardView.java b/java/src/com/android/inputmethod/latin/BaseKeyboardView.java
index 070d031..a31785f 100644
--- a/java/src/com/android/inputmethod/latin/BaseKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/BaseKeyboardView.java
@@ -332,28 +332,24 @@
         }
 
         public void startLongPressTimer(long delay, int keyIndex, PointerTracker tracker) {
-            removeMessages(MSG_LONGPRESS_KEY);
+            cancelLongPressTimers();
             sendMessageDelayed(obtainMessage(MSG_LONGPRESS_KEY, keyIndex, 0, tracker), delay);
         }
 
-        public void cancelLongPressTimer() {
-            removeMessages(MSG_LONGPRESS_KEY);
-        }
-
         public void startLongPressShiftTimer(long delay, int keyIndex, PointerTracker tracker) {
-            removeMessages(MSG_LONGPRESS_SHIFT_KEY);
+            cancelLongPressTimers();
             sendMessageDelayed(
                     obtainMessage(MSG_LONGPRESS_SHIFT_KEY, keyIndex, 0, tracker), delay);
         }
 
-        public void cancelLongPressShiftTimer() {
+        public void cancelLongPressTimers() {
+            removeMessages(MSG_LONGPRESS_KEY);
             removeMessages(MSG_LONGPRESS_SHIFT_KEY);
         }
 
         public void cancelKeyTimers() {
             cancelKeyRepeatTimer();
-            cancelLongPressTimer();
-            cancelLongPressShiftTimer();
+            cancelLongPressTimers();
         }
 
         public void cancelAllMessages() {

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

diff --git a/java/src/com/android/inputmethod/latin/PointerTracker.java b/java/src/com/android/inputmethod/latin/PointerTracker.java
index 2194ed9..c88a58d 100644
--- a/java/src/com/android/inputmethod/latin/PointerTracker.java
+++ b/java/src/com/android/inputmethod/latin/PointerTracker.java
@@ -315,11 +315,11 @@
         } else {
             if (keyState.getKeyIndex() != NOT_A_KEY) {
                 keyState.onMoveToNewKey(keyIndex, x ,y);
-                mHandler.cancelLongPressTimer();
+                mHandler.cancelLongPressTimers();
             } else if (!isMinorMoveBounce(x, y, keyIndex)) {
                 resetMultiTap();
                 keyState.onMoveToNewKey(keyIndex, x ,y);
-                mHandler.cancelLongPressTimer();
+                mHandler.cancelLongPressTimers();
             }
         }
         showKeyPreviewAndUpdateKeyGraphics(mKeyState.getKeyIndex());