diff options
| author | 2024-07-31 19:48:54 +0000 | |
|---|---|---|
| committer | 2024-07-31 19:48:54 +0000 | |
| commit | a9f30c2ab8f047272a1180212ad8e4001c02b3d9 (patch) | |
| tree | 37dec2ed273cf55c6bd72c08feb039549d395d5f | |
| parent | 6c356c54a539806cbf8e619675b79d9919bacfe5 (diff) | |
| parent | 9b613d6dd7ebfd619cb0256b6821a5dc0169b708 (diff) | |
Merge "[dev_option][More flags 4/n] Update all usages of Taskbar-show running apps flag to use DesktopModeFlags." into main
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlags.kt b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlags.kt index 2493e9804907..6d63971b0b3e 100644 --- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlags.kt +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlags.kt @@ -46,7 +46,8 @@ enum class DesktopModeFlags( DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, true), ENABLE_DESKTOP_WINDOWING_TASK_LIMIT(Flags::enableDesktopWindowingTaskLimit, true), BACK_NAVIGATION(Flags::enableDesktopWindowingBackNavigation, true), - EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true); + EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true), + TASKBAR_RUNNING_APPS(Flags::enableDesktopWindowingTaskbarRunningApps, true); /** * Determines state of flag based on the actual flag and desktop mode developer option diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java index 54f908b395e7..da7e03f465e9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java @@ -19,7 +19,6 @@ package com.android.wm.shell.recents; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.content.pm.PackageManager.FEATURE_PC; -import static com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps; import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS; import android.app.ActivityManager; @@ -365,7 +364,7 @@ public class RecentTasksController implements TaskStackListenerCallback, private boolean shouldEnableRunningTasksForDesktopMode() { return mPcFeatureEnabled || (DesktopModeStatus.canEnterDesktopMode(mContext) - && enableDesktopWindowingTaskbarRunningApps()); + && DesktopModeFlags.TASKBAR_RUNNING_APPS.isEnabled(mContext)); } @VisibleForTesting |