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

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

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

parents 0510c290 0499f31a

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

+1 −2
Original line number Diff line number Diff line
@@ -183,13 +183,12 @@ 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 || stashedSysUIState;

                        || stashedInTaskbarAllApps || stashedForSmallScreen;

            });



    public TaskbarStashController(TaskbarActivityContext activity) {