aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-12 01:37:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-12 01:37:17 -0800
commit0b7cecf1f01c3e04a060255dc8aec3d11509a81a (patch)
tree1f8972dd322888212ea59a9cc4b5b46ddc520a5a /java
parent1fefabfe23ae186e62c525dc6d64061c89007425 (diff)
parentdd6ba4b184c2572f4947fda7d0743a7be919045c (diff)
downloadlatinime-0b7cecf1f01c3e04a060255dc8aec3d11509a81a.tar.gz
latinime-0b7cecf1f01c3e04a060255dc8aec3d11509a81a.tar.xz
latinime-0b7cecf1f01c3e04a060255dc8aec3d11509a81a.zip
am dd6ba4b1: Merge "Fix bug in KeyPreviewChoreographer.dismissKeyPreview"
* commit 'dd6ba4b184c2572f4947fda7d0743a7be919045c': Fix bug in KeyPreviewChoreographer.dismissKeyPreview
Diffstat (limited to 'java')
-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();
}