From a5c6aad23114ce291d1f90c3dab53c3860a4fffb Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Tue, 3 Jan 2023 18:41:21 +0000 Subject: [PATCH] LauncherTaskbarUIController should only translate nav buttons on inAppProgresst if icon is aligned with hotseat Fix: 261364559 Test: Pull notification shade in overview, 3-buttons stay in place Test: Pull notification shade in home, 3-buttons translated down Test: Go to -1, 3-buttosn translated down Test: Go to AllApps, 3-buttons translated down Test: Go to widget picker, 3-buttons translated down Change-Id: I53da354266c60e86599011ba3ddd8b44cde70beb --- .../android/launcher3/taskbar/LauncherTaskbarUIController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 22f7f13587..a18aabebab 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -310,7 +310,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { return; } mTaskbarInAppDisplayProgress.put(progressIndex, progress); - if (!mControllers.taskbarStashController.isInApp() + if (mControllers.uiController.isIconAlignedWithHotseat() && !mTaskbarLauncherStateController.isAnimatingToLauncher()) { // Only animate the nav buttons while home and not animating home, otherwise let // the TaskbarViewController handle it.