diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index c5be13dbe1..f0129b4501 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -18,8 +18,8 @@ package com.android.launcher3.taskbar; import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY; import static com.android.launcher3.QuickstepTransitionManager.TASKBAR_TO_APP_DURATION; -import static com.android.launcher3.QuickstepTransitionManager.getTaskbarToHomeDuration; import static com.android.launcher3.QuickstepTransitionManager.TRANSIENT_TASKBAR_TRANSITION_DURATION; +import static com.android.launcher3.QuickstepTransitionManager.getTaskbarToHomeDuration; import static com.android.launcher3.statemanager.BaseState.FLAG_NON_INTERACTIVE; import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTIP_STEP_FEATURES; import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_VISIBLE; @@ -275,7 +275,8 @@ public class LauncherTaskbarUIController extends TaskbarUIController { if (mControllers.bubbleControllers.isEmpty() || hotseat == null) return; boolean hiddenForBubbles = mControllers.bubbleControllers.get().bubbleBarViewController.isHiddenForNoBubbles(); - hotseat.post(() -> adjustHotseatForBubbleBar(!hiddenForBubbles)); + if (hiddenForBubbles) return; + hotseat.post(() -> adjustHotseatForBubbleBar(/* isBubbleBarVisible= */ true)); } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java index db707247ad..826722dbb3 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java @@ -227,7 +227,9 @@ public class TaskbarControllers { bubbleControllers.bubbleBarViewController.getBubbleBarLocation(); boolean hiddenForBubbles = bubbleControllers.bubbleBarViewController.isHiddenForNoBubbles(); - uiController.adjustHotseatForBubbleBar(!hiddenForBubbles); + if (!hiddenForBubbles) { + uiController.adjustHotseatForBubbleBar(/* isBubbleBarVisible= */ true); + } uiController.onBubbleBarLocationUpdated(location); }, () -> uiController.onBubbleBarLocationUpdated(null)); // Notify that the ui controller has changed