Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d2091e8 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Show Taskbar when Glanceable Hub is showing." into main

parents b9ce69db 6668ab9c

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+5 −2
Original line number Diff line number Diff line
@@ -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);