From 6668ab9cab694d13325798f5950bf106a4e1f84a Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Fri, 23 Aug 2024 13:20:44 -0700 Subject: [PATCH] Show Taskbar when Glanceable Hub is showing. This changelist ensures that the Taskbar is not hidden when the Glanceable Hub is showing. Logic for hiding the Taskbar when dreaming was suppressing it from showing when Glanceable Hub was present. The surrounding condition has been updated to now not trigger is Glanceable Hub is showing. Test: manual - verified Taskbar was properly displayed and hidden between glanceable hub and dreaming. Flag: EXEMPT bugfix Fixes: 353803584 Change-Id: I58a61617baff65041757ae0df96687a071120880 --- .../launcher3/taskbar/TaskbarLauncherStateController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index a5395d9be9..eb1165acc6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -23,6 +23,7 @@ import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_HO import static com.android.launcher3.util.FlagDebugUtils.appendFlag; import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_AWAKE; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_COMMUNAL_HUB_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_MASK; import static com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_AWAKE; @@ -351,8 +352,10 @@ public class TaskbarLauncherStateController { // interactive dreams, AoD, screen off. Since the SYSUI_STATE_DEVICE_DREAMING only kicks in // when the device is asleep, the second condition extends ensures that the transition from // and to the WAKEFULNESS_ASLEEP state also hide the taskbar, and improves the taskbar - // hide/reveal animation timings. - boolean isTaskbarHidden = hasAnyFlag(systemUiStateFlags, SYSUI_STATE_DEVICE_DREAMING) + // hide/reveal animation timings. The Taskbar can show when dreaming if the glanceable hub + // is showing on top. + boolean isTaskbarHidden = (hasAnyFlag(systemUiStateFlags, SYSUI_STATE_DEVICE_DREAMING) + && !hasAnyFlag(systemUiStateFlags, SYSUI_STATE_COMMUNAL_HUB_SHOWING)) || (systemUiStateFlags & SYSUI_STATE_WAKEFULNESS_MASK) != WAKEFULNESS_AWAKE; updateStateForFlag(FLAG_TASKBAR_HIDDEN, isTaskbarHidden);