diff options
| -rw-r--r-- | core/java/android/window/DesktopExperienceFlags.java | 11 | ||||
| -rw-r--r-- | core/java/android/window/DesktopModeFlags.java | 97 |
2 files changed, 56 insertions, 52 deletions
diff --git a/core/java/android/window/DesktopExperienceFlags.java b/core/java/android/window/DesktopExperienceFlags.java index cb5e98f0664a..e0c48b03dad8 100644 --- a/core/java/android/window/DesktopExperienceFlags.java +++ b/core/java/android/window/DesktopExperienceFlags.java @@ -40,9 +40,7 @@ import java.util.function.BooleanSupplier; * @hide */ public enum DesktopExperienceFlags { - ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT( - com.android.server.display.feature.flags.Flags::enableDisplayContentModeManagement, - true), + // go/keep-sorted start ACTIVITY_EMBEDDING_SUPPORT_FOR_CONNECTED_DISPLAYS( Flags::activityEmbeddingSupportForConnectedDisplays, false), BASE_DENSITY_FOR_EXTERNAL_DISPLAYS( @@ -53,6 +51,9 @@ public enum DesktopExperienceFlags { ENABLE_CONNECTED_DISPLAYS_DND(Flags::enableConnectedDisplaysDnd, false), ENABLE_CONNECTED_DISPLAYS_PIP(Flags::enableConnectedDisplaysPip, false), ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG(Flags::enableConnectedDisplaysWindowDrag, false), + ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT( + com.android.server.display.feature.flags.Flags::enableDisplayContentModeManagement, + true), ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS(Flags::enableDisplayFocusInShellTransitions, false), ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING(Flags::enableDisplayWindowingModeSwitching, false), ENABLE_DRAG_TO_MAXIMIZE(Flags::enableDragToMaximize, true), @@ -66,7 +67,9 @@ public enum DesktopExperienceFlags { ENABLE_TASKBAR_CONNECTED_DISPLAYS(Flags::enableTaskbarConnectedDisplays, false), ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS(Flags::enterDesktopByDefaultOnFreeformDisplays, false), - REPARENT_WINDOW_TOKEN_API(Flags::reparentWindowTokenApi, true); + REPARENT_WINDOW_TOKEN_API(Flags::reparentWindowTokenApi, true) + // go/keep-sorted end + ; /** * Flag class, to be used in case the enum cannot be used because the flag is not accessible. diff --git a/core/java/android/window/DesktopModeFlags.java b/core/java/android/window/DesktopModeFlags.java index 05da9990b0e2..f86a4249c0e1 100644 --- a/core/java/android/window/DesktopModeFlags.java +++ b/core/java/android/window/DesktopModeFlags.java @@ -42,67 +42,68 @@ import java.util.function.BooleanSupplier; */ public enum DesktopModeFlags { // All desktop mode related flags to be overridden by developer option toggle will be added here - ENABLE_DESKTOP_WINDOWING_MODE( - Flags::enableDesktopWindowingMode, /* shouldOverrideByDevOption= */ true), - ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, true), - ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION( - Flags::enableCaptionCompatInsetForceConsumption, true), + // go/keep-sorted start + DISABLE_NON_RESIZABLE_APP_SNAP_RESIZE(Flags::disableNonResizableAppSnapResizing, true), + ENABLE_APP_HEADER_WITH_TASK_DENSITY(Flags::enableAppHeaderWithTaskDensity, true), + ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION(Flags::enableCaptionCompatInsetForceConsumption, + true), ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS( Flags::enableCaptionCompatInsetForceConsumptionAlways, true), ENABLE_CASCADING_WINDOWS(Flags::enableCascadingWindows, true), - ENABLE_TILE_RESIZING(Flags::enableTileResizing, true), - ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY( - Flags::enableDesktopWindowingWallpaperActivity, true), - ENABLE_DESKTOP_WINDOWING_MODALS_POLICY(Flags::enableDesktopWindowingModalsPolicy, true), - ENABLE_THEMED_APP_HEADERS(Flags::enableThemedAppHeaders, true), - ENABLE_HOLD_TO_DRAG_APP_HANDLE(Flags::enableHoldToDragAppHandle, true), - ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH(Flags::enableDesktopWindowingQuickSwitch, true), - ENABLE_APP_HEADER_WITH_TASK_DENSITY(Flags::enableAppHeaderWithTaskDensity, true), - ENABLE_TASK_STACK_OBSERVER_IN_SHELL(Flags::enableTaskStackObserverInShell, true), - ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS(Flags::enableDesktopWindowingSizeConstraints, true), - DISABLE_NON_RESIZABLE_APP_SNAP_RESIZE(Flags::disableNonResizableAppSnapResizing, true), - ENABLE_WINDOWING_SCALED_RESIZING(Flags::enableWindowingScaledResizing, true), - ENABLE_DESKTOP_WINDOWING_TASK_LIMIT(Flags::enableDesktopWindowingTaskLimit, true), + ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX( + Flags::enableDesktopAppLaunchAlttabTransitionsBugfix, true), + ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX(Flags::enableDesktopAppLaunchTransitionsBugfix, + true), + ENABLE_DESKTOP_COMPAT_UI_VISIBILITY_STATUS(Flags::enableCompatUiVisibilityStatus, true), + ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX( + Flags::enableDesktopRecentsTransitionsCornersBugfix, false), + ENABLE_DESKTOP_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE_BUGFIX( + Flags::skipCompatUiEducationInDesktopMode, true), + ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true), + ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER( + Flags::enableDesktopWallpaperActivityForSystemUser, true), ENABLE_DESKTOP_WINDOWING_APP_TO_WEB(Flags::enableDesktopWindowingAppToWeb, true), - ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION( - Flags::enableDesktopWindowingAppToWebEducation, true), + ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION(Flags::enableDesktopWindowingAppToWebEducation, + true), ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION(Flags::enableDesktopWindowingBackNavigation, true), - ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true), - ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS( - Flags::enableDesktopWindowingTaskbarRunningApps, true), - ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS( - Flags::enableWindowingTransitionHandlersObservers, false), - ENABLE_DESKTOP_WINDOWING_PERSISTENCE(Flags::enableDesktopWindowingPersistence, false), - ENABLE_HANDLE_INPUT_FIX(Flags::enableHandleInputFix, true), ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX( Flags::enableDesktopWindowingEnterTransitionBugfix, true), + ENABLE_DESKTOP_WINDOWING_EXIT_BY_MINIMIZE_TRANSITION_BUGFIX( + Flags::enableDesktopWindowingExitByMinimizeTransitionBugfix, false), ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX( Flags::enableDesktopWindowingExitTransitionsBugfix, true), - ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX( - Flags::enableDesktopAppLaunchAlttabTransitionsBugfix, true), - ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX( - Flags::enableDesktopAppLaunchTransitionsBugfix, true), - ENABLE_DESKTOP_COMPAT_UI_VISIBILITY_STATUS( - Flags::enableCompatUiVisibilityStatus, true), - ENABLE_DESKTOP_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE_BUGFIX( - Flags::skipCompatUiEducationInDesktopMode, true), - INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC( - Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true), ENABLE_DESKTOP_WINDOWING_HSUM(Flags::enableDesktopWindowingHsum, true), + ENABLE_DESKTOP_WINDOWING_MODALS_POLICY(Flags::enableDesktopWindowingModalsPolicy, true), + ENABLE_DESKTOP_WINDOWING_MODE(Flags::enableDesktopWindowingMode, true), + ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES( + Flags::enableDesktopWindowingMultiInstanceFeatures, true), + ENABLE_DESKTOP_WINDOWING_PERSISTENCE(Flags::enableDesktopWindowingPersistence, false), + ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH(Flags::enableDesktopWindowingQuickSwitch, true), + ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS(Flags::enableDesktopWindowingSizeConstraints, true), + ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS(Flags::enableDesktopWindowingTaskbarRunningApps, + true), + ENABLE_DESKTOP_WINDOWING_TASK_LIMIT(Flags::enableDesktopWindowingTaskLimit, true), + ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY(Flags::enableDesktopWindowingWallpaperActivity, + true), + ENABLE_HANDLE_INPUT_FIX(Flags::enableHandleInputFix, true), + ENABLE_HOLD_TO_DRAG_APP_HANDLE(Flags::enableHoldToDragAppHandle, true), ENABLE_MINIMIZE_BUTTON(Flags::enableMinimizeButton, true), ENABLE_RESIZING_METRICS(Flags::enableResizingMetrics, true), 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), - ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES( - Flags::enableDesktopWindowingMultiInstanceFeatures, true), - ENABLE_DESKTOP_WINDOWING_EXIT_BY_MINIMIZE_TRANSITION_BUGFIX( - Flags::enableDesktopWindowingExitByMinimizeTransitionBugfix, false); + ENABLE_TASK_STACK_OBSERVER_IN_SHELL(Flags::enableTaskStackObserverInShell, true), + ENABLE_THEMED_APP_HEADERS(Flags::enableThemedAppHeaders, true), + ENABLE_TILE_RESIZING(Flags::enableTileResizing, true), + ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING(Flags::enableTopVisibleRootTaskPerUserTracking, + true), + ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, true), + ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true), + ENABLE_WINDOWING_SCALED_RESIZING(Flags::enableWindowingScaledResizing, true), + ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS( + Flags::enableWindowingTransitionHandlersObservers, false), + INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC( + Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true) + // go/keep-sorted end + ; /** * Flag class, to be used in case the enum cannot be used because the flag is not accessible. |