commit 99b7242f784d7cbad6acfc99c12cf7faca9370b8
author Keisuke Kuroyanagi <ksk@google.com> Tue Feb 04 07:51:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 04 07:51:00 2014 +0000
tree d528aa8b2d8e61628e9026d0c230726c589426f9
parent ffb12e76b88c0e074a2316a10d7ec8857c4b2a39
parent d79fd29f614334614f05fe8852318085a18f7857

Merge "Make dumpAllWordsForDebug() use getNextWordProperty()."

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