From f01ca85c209c31c1274728dc0648a59a343df6b9 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Wed, 1 Mar 2023 17:17:36 -0800 Subject: [PATCH] Prevent QSB from being a part of the icon reveal animation. Fixes: 270694593 Test: taskbar on foldable and tablet Change-Id: I1782f715454da1240174be1b4f496c910be3764a --- .../launcher3/taskbar/TaskbarStashController.java | 2 +- .../android/launcher3/taskbar/TaskbarViewController.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index bbf861bd8b..115db25b52 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -723,7 +723,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba } } play(as, mControllers.taskbarViewController - .createRevealAnimToIsStashed(isStashed, isInApp()), 0, duration, EMPHASIZED); + .createRevealAnimToIsStashed(isStashed), 0, duration, EMPHASIZED); if (skipInterpolator != null) { as.setInterpolator(skipInterpolator); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index c7088382d0..ac92374e1c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -17,6 +17,7 @@ package com.android.launcher3.taskbar; import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; +import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y; import static com.android.launcher3.Utilities.squaredHypot; import static com.android.launcher3.anim.AnimatedFloat.VALUE; import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; @@ -303,7 +304,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar * @param isStashed When true, the icon crops vertically to the size of the stashed handle. * When false, the reverse happens. */ - public AnimatorSet createRevealAnimToIsStashed(boolean isStashed, boolean isInApp) { + public AnimatorSet createRevealAnimToIsStashed(boolean isStashed) { AnimatorSet as = new AnimatorSet(); Rect stashedBounds = new Rect(); @@ -317,6 +318,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar for (int i = numChildren - 1; i >= 0; i--) { View child = mTaskbarView.getChildAt(i); + if (child == mTaskbarView.getQsb()) { + continue; + } + // Crop the icons to/from the nav handle shape. as.play(createRevealAnimForView(child, isStashed)); @@ -437,7 +442,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar float scale = ((float) taskbarDp.iconSizePx) / launcherDp.hotseatQsbVisualHeight; setter.addFloat(child, SCALE_PROPERTY, scale, 1f, interpolator); - setter.setFloat(child, ICON_TRANSLATE_Y, mTaskbarBottomMargin, interpolator); + setter.setFloat(child, VIEW_TRANSLATE_Y, mTaskbarBottomMargin, interpolator); if (mIsHotseatIconOnTopWhenAligned) { setter.addFloat(child, VIEW_ALPHA, 0f, 1f,