commit 5be8a59a5a6d6a57a253812654c6283ce5b63d73
author Tadashi G. Takaoka <takaoka@google.com> Tue Feb 04 11:43:58 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Feb 04 11:43:58 2014 +0900
tree 55397d041800f5da111f62c9dc6354dd245cfba5
parent b06e455797c0229fa068cfb2809c95c775ec695c

Use "Key popup dismiss delay" to control key preview zoom out animation

Bug: 12809303
Change-Id: I2db0362a2f8c512145f1cf9326f06e5f922987b8

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index 810bd91..3a28699 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -705,7 +705,8 @@
         final AnimatorSet zoomOutAnimation = new AnimatorSet();
         zoomOutAnimation.play(scaleXAnimation).with(scaleYAnimation);
         // TODO: Implement preference option to control key preview animation duration.
-        zoomOutAnimation.setDuration(mKeyPreviewZoomOutDuration);
+        final int zoomOutDuration = Math.min(mKeyPreviewZoomOutDuration, mKeyPreviewLingerTimeout);
+        zoomOutAnimation.setDuration(zoomOutDuration);
         zoomOutAnimation.setInterpolator(ACCELERATE_INTERPOLATOR);
         zoomOutAnimation.addListener(new AnimatorListenerAdapter() {
             @Override