diff options
| -rw-r--r-- | core/java/android/window/DesktopModeFlags.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/window/DesktopModeFlags.java b/core/java/android/window/DesktopModeFlags.java index d1e3a2d953ef..e884560dfc63 100644 --- a/core/java/android/window/DesktopModeFlags.java +++ b/core/java/android/window/DesktopModeFlags.java @@ -96,6 +96,8 @@ public enum DesktopModeFlags { ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS(Flags::enableTaskResizingKeyboardShortcuts, true), ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER( Flags::enableDesktopWallpaperActivityForSystemUser, true), + ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING( + Flags::enableTopVisibleRootTaskPerUserTracking, true), ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX( Flags::enableDesktopRecentsTransitionsCornersBugfix, false), ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true); diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index e2b5c839fb0d..abd26b5164f7 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -138,6 +138,7 @@ import android.view.Display; import android.view.DisplayInfo; import android.view.SurfaceControl; import android.view.WindowManager; +import android.window.DesktopModeFlags; import android.window.TaskFragmentAnimationParams; import android.window.WindowContainerToken; @@ -1908,7 +1909,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // appropriate. removeRootTasksInWindowingModes(WINDOWING_MODE_PINNED); - if (Flags.enableTopVisibleRootTaskPerUserTracking()) { + if (DesktopModeFlags.ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING.isTrue()) { final IntArray visibleRootTasks = new IntArray(); forAllRootTasks(rootTask -> { if ((mCurrentUser == rootTask.mUserId || rootTask.showForAllUsers()) |