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

Commit 0a381d41 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Include SysUI state in stashing check" into tm-qpr-dev

parents d7107738 62c74f96

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

+2 −1
Original line number Diff line number Diff line
@@ -184,12 +184,13 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
            flags -> {

                boolean inApp = hasAnyFlag(flags, FLAGS_IN_APP);

                boolean stashedInApp = hasAnyFlag(flags, FLAGS_STASHED_IN_APP);

                boolean stashedSysUIState = hasAnyFlag(flags, FLAG_STASHED_IN_SYSUI_STATE);

                boolean stashedLauncherState = hasAnyFlag(flags, FLAG_IN_STASHED_LAUNCHER_STATE);

                boolean stashedInTaskbarAllApps =

                        hasAnyFlag(flags, FLAG_STASHED_IN_TASKBAR_ALL_APPS);

                boolean stashedForSmallScreen = hasAnyFlag(flags, FLAG_STASHED_SMALL_SCREEN);

                return (inApp && stashedInApp) || (!inApp && stashedLauncherState)

                        || stashedInTaskbarAllApps || stashedForSmallScreen;

                        || stashedInTaskbarAllApps || stashedForSmallScreen || stashedSysUIState;

            });



    public TaskbarStashController(TaskbarActivityContext activity) {