aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-09 12:53:35 +0900
committerJean Chalard <jchalard@google.com>2014-01-09 12:57:10 +0900
commit5cbda70956af14453fca7395d892c59aabbd8fd3 (patch)
treec1ed94b5b248c4d86bb6a6c9794da0784b43cbd9 /java/src
parente5cdcaff658f5366621115a728cb683eab5fda0a (diff)
downloadlatinime-5cbda70956af14453fca7395d892c59aabbd8fd3.tar.gz
latinime-5cbda70956af14453fca7395d892c59aabbd8fd3.tar.xz
latinime-5cbda70956af14453fca7395d892c59aabbd8fd3.zip
Fix a bug where changing auto-shift would cancel autorepeat.
Bug: 12453966 Change-Id: Idd65f732e2de0a7309e08315893c28cca63732c5
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java4
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index e1c841de7..810bd9150 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -424,8 +424,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
*/
@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());
diff --git a/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java b/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java
index 3298a3f24..ec7b9b024 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 @@ public final class TimerHandler extends LeakGuardHandlerWrapper<Callbacks> imple
removeMessages(MSG_LONGPRESS_SHIFT_KEY);
}
- private void cancelLongPressTimers() {
+ public void cancelLongPressTimers() {
removeMessages(MSG_LONGPRESS_KEY);
removeMessages(MSG_LONGPRESS_SHIFT_KEY);
}