Merge "End any running taskbar animation in cleanup()" into sc-dev (43e51622) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarController.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ public class TaskbarController {
		// Contains all loaded Hotseat items.
		private ItemInfo[] mLatestLoadedHotseatItems;

		private @Nullable Animator mAnimator;
		private boolean mIsAnimatingToLauncher;

		public TaskbarController(BaseQuickstepLauncher launcher,
		@@ -252,6 +253,10 @@ public class TaskbarController {
		mTaskbarVisibilityController.cleanup();
		mHotseatController.cleanup();
		mRecentsController.cleanup();

		if (mAnimator != null) {
		mAnimator.end();
		}
		}

		private void removeFromWindowManager() {
		@@ -294,13 +299,21 @@ public class TaskbarController {
		*/
		public void onLauncherResumedOrPaused(boolean isResumed) {
		long duration = QuickstepAppTransitionManagerImpl.CONTENT_ALPHA_DURATION;
		final Animator anim;
		if (mAnimator != null) {
		mAnimator.cancel();
		}
		if (isResumed) {
		anim = createAnimToLauncher(null, duration);
		mAnimator = createAnimToLauncher(null, duration);
		} else {
		anim = createAnimToApp(duration);
		mAnimator = createAnimToApp(duration);
		}
		anim.start();
		mAnimator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mAnimator = null;
		}
		});
		mAnimator.start();
		}

		/**