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

Commit 25eaff39 authored by Olivier St-Onge's avatar Olivier St-Onge Committed by Android (Google) Code Review
Browse files

Merge "Stash taskbar when a SysUI dialog appears." into main

parents ff4f1624 27c0258c

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

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static com.android.launcher3.util.FlagDebugUtils.appendFlag; 
import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange;

import static com.android.quickstep.util.SystemActionConstants.SYSTEM_ACTION_ID_TASKBAR;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DIALOG_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE;
@@ -1018,7 +1019,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        long startDelay = 0;



        updateStateForFlag(FLAG_STASHED_IN_APP_SYSUI, hasAnyFlag(systemUiStateFlags,

                SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE));

                SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE | SYSUI_STATE_DIALOG_SHOWING));



        boolean stashForBubbles = hasAnyFlag(FLAG_IN_OVERVIEW)

                && hasAnyFlag(systemUiStateFlags, SYSUI_STATE_BUBBLES_EXPANDED)