From 3d0f0eb21396dd3a4077babe042daa8ccf34ea1c Mon Sep 17 00:00:00 2001 From: Ats Jenk Date: Wed, 20 Nov 2024 11:04:21 -0800 Subject: [PATCH] Fix bubble bar stash delay Bubble bar was stashing with a delay compared to taskbar. This is because taskbar stashing looks at isInLauncher value in addition to launcher state. Add this check to the bubble bar in overview condition. And only consider bubble bar showing in overview if we isInLauncher returns true and launcher state is overview. Bug: 371229068 Test: manual, start from home with bubble bar shown, swipe up to overview, tap on an app, observe that bubble bar stashes at the same time as taskbar Test: swipe up to home, open all apps, check that bubble bar remains visible Flag: com.android.wm.shell.enable_bubble_bar Change-Id: Icedfd29300f739e37d636122bad0fb6e14fa2ced --- .../launcher3/taskbar/TaskbarLauncherStateController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index dce377d5d7..1967df5b5e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -475,7 +475,7 @@ public class TaskbarLauncherStateController { } mControllers.bubbleControllers.ifPresent(controllers -> { // Show the bubble bar when on launcher home (hotseat icons visible) or in overview - boolean onOverview = mLauncherState == LauncherState.OVERVIEW; + boolean onOverview = isInLauncher && mLauncherState == LauncherState.OVERVIEW; boolean hotseatIconsVisible = isInLauncher && mLauncherState.areElementsVisible( mLauncher, HOTSEAT_ICONS); BubbleLauncherState state = onOverview