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

This commit is contained in:
Tadashi G. Takaoka 2014-02-04 04:42:36 +00:00 committed by Android (Google) Code Review
commit 96aee22e7b

View File

@ -705,7 +705,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
final AnimatorSet zoomOutAnimation = new AnimatorSet(); final AnimatorSet zoomOutAnimation = new AnimatorSet();
zoomOutAnimation.play(scaleXAnimation).with(scaleYAnimation); zoomOutAnimation.play(scaleXAnimation).with(scaleYAnimation);
// TODO: Implement preference option to control key preview animation duration. // 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.setInterpolator(ACCELERATE_INTERPOLATOR);
zoomOutAnimation.addListener(new AnimatorListenerAdapter() { zoomOutAnimation.addListener(new AnimatorListenerAdapter() {
@Override @Override