commit 6b0bcfba9b9a1f2079769aa331a7fc4daf071d9b
author Tadashi G. Takaoka <takaoka@google.com> Mon May 13 08:57:56 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 13 08:57:56 2013 +0000
tree a869aba9f50ef15a1d989b57d328c944bac7b6fe
parent ad662adeef10c4b202f8f5f80037dd5b8fc9583d
parent 43ad100d8bc20fc1327a462f24b5f8c99849ffbe

Merge "Disable long press timer while sliding input mode"

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 3ed6c89..5a2af80 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -1247,10 +1247,13 @@
     }
 
     private void startRepeatKey(final Key key) {
-        if (key != null && key.isRepeatable() && !sInGesture) {
-            onRegisterKey(key);
-            mTimerProxy.startKeyRepeatTimer(this);
-        }
+        if (sInGesture) return;
+        if (key == null) return;
+        if (!key.isRepeatable()) return;
+        // Don't start key repeat when we are in sliding input mode.
+        if (mIsInSlidingKeyInputFromModifier) return;
+        onRegisterKey(key);
+        mTimerProxy.startKeyRepeatTimer(this);
     }
 
     public void onRegisterKey(final Key key) {