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

* commit 'dd6ba4b184c2572f4947fda7d0743a7be919045c':
  Fix bug in KeyPreviewChoreographer.dismissKeyPreview
main
Tadashi G. Takaoka 2014-02-12 01:37:17 -08:00 committed by Android Git Automerger
commit 0b7cecf1f0
1 changed files with 2 additions and 1 deletions

View File

@ -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();
}