diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-04 04:42:36 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-02-04 04:42:36 +0000 |
| commit | 96aee22e7b63d5a0392615a7bc8f7f90e4a7ea19 (patch) | |
| tree | 3de69fd8503165cecdf1d5811f0e6beb66c6e110 /java/src | |
| parent | 0251c60b4434f702623803b454ac59e8ff2efc4a (diff) | |
| parent | 5be8a59a5a6d6a57a253812654c6283ce5b63d73 (diff) | |
| download | latinime-96aee22e7b63d5a0392615a7bc8f7f90e4a7ea19.tar.gz latinime-96aee22e7b63d5a0392615a7bc8f7f90e4a7ea19.tar.xz latinime-96aee22e7b63d5a0392615a7bc8f7f90e4a7ea19.zip | |
Merge "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 |