commit d3e78fc5ce8be694bd97e6580d761f3e4ec6e519
author Jean Chalard <jchalard@google.com> Thu Jan 09 04:53:32 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 09 04:53:34 2014 +0000
tree bf96d1a22890a19ae5443c2782d6789686478442
parent 941a4540bc648f329d3dd8e357d33ccd80694679
parent 5cbda70956af14453fca7395d892c59aabbd8fd3

Merge "Fix a bug where changing auto-shift would cancel autorepeat."

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

diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index e1c841d..810bd91 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -424,8 +424,8 @@
      */
     @Override
     public void setKeyboard(final Keyboard keyboard) {
-        // Remove any pending messages.
-        mKeyTimerHandler.cancelAllKeyTimers();
+        // Remove any pending messages, except dismissing preview and key repeat.
+        mKeyTimerHandler.cancelLongPressTimers();
         super.setKeyboard(keyboard);
         mKeyDetector.setKeyboard(
                 keyboard, -getPaddingLeft(), -getPaddingTop() + getVerticalCorrection());

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

diff --git a/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java b/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java
index 3298a3f..ec7b9b0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java
@@ -126,7 +126,7 @@
         removeMessages(MSG_LONGPRESS_SHIFT_KEY);
     }
 
-    private void cancelLongPressTimers() {
+    public void cancelLongPressTimers() {
         removeMessages(MSG_LONGPRESS_KEY);
         removeMessages(MSG_LONGPRESS_SHIFT_KEY);
     }