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
main
Tadashi G. Takaoka 2014-02-03 20:45:12 -08:00 committed by Android Git Automerger
commit e146944466
1 changed files with 2 additions and 1 deletions

View File

@ -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