am dd6ba4b1: Merge "Fix bug in KeyPreviewChoreographer.dismissKeyPreview"

* commit 'dd6ba4b184c2572f4947fda7d0743a7be919045c': Fix bug in KeyPreviewChoreographer.dismissKeyPreview
2014-02-12 01:37:17 -08:00 · 2014-02-12 01:37:17 -08:00 · 0b7cecf1f0
parent 1fefabfe23 dd6ba4b184
commit 0b7cecf1f0
1 changed files with 2 additions and 1 deletions
--- 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;
            }
+        }
        // Dismiss preview without animation.
+        mShowingKeyPreviewTextViews.remove(key);
        if (tag instanceof Animator) {
            ((Animator)tag).cancel();
        }