Merge "[Bouncer] Move reset logic to end event." into tm-dev (277f9b3b) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -216,22 +216,16 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> {
		});
		}
		alphaAnim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationCancel(Animator animation) {
		// If Animation is canceled, we want to ensure UI is reset.
		view.setAlpha(targetAlpha);
		view.setTranslationY(targetTranslationY);
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		view.setAlpha(targetAlpha);
		if (endRunnable != null) {
		endRunnable.run();
		}
		}
		});
		alphaAnim.start();
		startTranslationYAnimation(view, delay, duration, appearing ? 0 : translationY,
		startTranslationYAnimation(view, delay, duration, targetTranslationY,
		interpolator, animatorListener);
		}
		}
		@@ -265,6 +259,12 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> {
		if (listener != null) {
		translationAnim.addListener(listener);
		}
		translationAnim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		view.setTranslationY(endTranslationY);
		}
		});
		translationAnim.start();
		}