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

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2023-01-29 05:57:50 +00:00
commit 0a381d4115
1 file changed
+2 -1
@@ -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) {