Merge "Iterative improvement to the taskbar stash animation." into tm-qpr-dev

This commit is contained in:
Jon Miranda
2023-02-03 02:39:10 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 4 deletions

View File

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

View File

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