aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-12 09:13:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-12 09:13:37 +0000
commitdd6ba4b184c2572f4947fda7d0743a7be919045c (patch)
treed2f6a42ea3939c30543d3ed78b796e5eaed00f0d /java/src/com/android/inputmethod
parent351c8e6185a3b301a7469358cc1df5d075fc1b01 (diff)
parent7e9b0b42bfd5c51f4bc236a73df3f14cf583c989 (diff)
downloadlatinime-dd6ba4b184c2572f4947fda7d0743a7be919045c.tar.gz
latinime-dd6ba4b184c2572f4947fda7d0743a7be919045c.tar.xz
latinime-dd6ba4b184c2572f4947fda7d0743a7be919045c.zip
Merge "Fix bug in KeyPreviewChoreographer.dismissKeyPreview"
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java b/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java
index ff197ba27..625d1f0a4 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java
@@ -101,10 +101,11 @@ public final class KeyPreviewChoreographer {
if (tag instanceof KeyPreviewAnimations) {
final KeyPreviewAnimations animation = (KeyPreviewAnimations)tag;
animation.startDismiss();
+ return;
}
- return;
}
// Dismiss preview without animation.
+ mShowingKeyPreviewTextViews.remove(key);
if (tag instanceof Animator) {
((Animator)tag).cancel();
}