Merge "Revert "Include SysUI state in stashing check"" into tm-qpr-dev am: 537c380bcb am: 9d26c12ac4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21236591

Change-Id: I0c1283ad8f4e427d345de1b6927b39da2e139c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-02-03 18:43:42 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {