diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-03 20:45:12 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 20:45:12 -0800 |
| commit | e146944466752b7a5b89c5c90851c24baa9bee58 (patch) | |
| tree | 63d0ac65bc52bfcd2bc07dcd61ed8ded40ffb589 /java/src | |
| parent | 96bf88f1b249b5e1c55c7c1ce0a9bcda4f4e4f8e (diff) | |
| parent | 96aee22e7b63d5a0392615a7bc8f7f90e4a7ea19 (diff) | |
| download | latinime-e146944466752b7a5b89c5c90851c24baa9bee58.tar.gz latinime-e146944466752b7a5b89c5c90851c24baa9bee58.tar.xz latinime-e146944466752b7a5b89c5c90851c24baa9bee58.zip | |
am 96aee22e: Merge "Use "Key popup dismiss delay" to control key preview zoom out animation"
* commit '96aee22e7b63d5a0392615a7bc8f7f90e4a7ea19':
Use "Key popup dismiss delay" to control key preview zoom out animation
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index 810bd9150..3a2869950 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -705,7 +705,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 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 |