Merge "Iterative improvement to the taskbar stash animation." into tm-qpr-dev (554c431d) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) {
		// Approximates the stash/unstash animation to transform the background.
		val scaleFactor = backgroundHeight / maxBackgroundHeight
		val width = transientBackgroundBounds.width()
		val widthScale = mapToRange(scaleFactor, 0f, 1f, 0.4f, 1f, Interpolators.LINEAR)
		val widthScale = mapToRange(scaleFactor, 0f, 1f, 0.2f, 1f, Interpolators.LINEAR)
		val newWidth = widthScale * width
		val delta = width - newWidth
		canvas.translate(0f, bottomMargin * ((1f - scaleFactor) / 2f))

+2 −3

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		/**
		* The scale TaskbarView animates to when being stashed.
		*/
		private static final float STASHED_TASKBAR_SCALE = 0.5f;
		private static final float STASHED_TASKBAR_SCALE = 0.3f;

		/**
		* How long the hint animation plays, starting on motion down.
		@@ -516,8 +516,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		}
		mAnimator = new AnimatorSet();
		addJankMonitorListener(mAnimator, /* appearing= */ !mIsStashed);
		final float stashTranslation = isPhoneMode() ? 0 :
		(mUnstashedHeight - mStashedHeight) / 2f;
		final float stashTranslation = isPhoneMode() ? 0 : (mUnstashedHeight - mStashedHeight);

		if (!supportsVisualStashing()) {
		// Just hide/show the icons and background instead of stashing into a handle.