Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9d0a2f1 authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille Committed by Android (Google) Code Review
Browse files

Merge "Enable DesktopExperienceFlags in developer option for features in teamfood" into main

parents b740d38c e9d4c522

core/java/android/window/DesktopExperienceFlags.java

+11 −11
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY),

            Flags.FLAG_ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY),

    ENABLE_CONNECTED_DISPLAYS_DND(Flags::enableConnectedDisplaysDnd, true,

    ENABLE_CONNECTED_DISPLAYS_DND(Flags::enableConnectedDisplaysDnd, true,

            Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_DND),

            Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_DND),

    ENABLE_CONNECTED_DISPLAYS_PIP(Flags::enableConnectedDisplaysPip, false,

    ENABLE_CONNECTED_DISPLAYS_PIP(Flags::enableConnectedDisplaysPip, true,

            Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_PIP),

            Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_PIP),

    ENABLE_CONNECTED_DISPLAYS_WALLPAPER(android.app.Flags::enableConnectedDisplaysWallpaper, true,

    ENABLE_CONNECTED_DISPLAYS_WALLPAPER(android.app.Flags::enableConnectedDisplaysWallpaper, true,

            android.app.Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WALLPAPER),

            android.app.Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WALLPAPER),
@@ -112,18 +112,18 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS),

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS),

    ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS(Flags::enableFreeformDisplayLaunchParams, false,

    ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS(Flags::enableFreeformDisplayLaunchParams, false,

            Flags.FLAG_ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS),

            Flags.FLAG_ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS),

    ENABLE_INDEPENDENT_BACK_IN_PROJECTED(Flags::enableIndependentBackInProjected, false,

    ENABLE_INDEPENDENT_BACK_IN_PROJECTED(Flags::enableIndependentBackInProjected, true,

            Flags.FLAG_ENABLE_INDEPENDENT_BACK_IN_PROJECTED),

            Flags.FLAG_ENABLE_INDEPENDENT_BACK_IN_PROJECTED),

    ENABLE_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS(Flags::keyboardShortcutsToSwitchDesks, false,

    ENABLE_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS(Flags::keyboardShortcutsToSwitchDesks, true,

            Flags.FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS),

            Flags.FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS),

    ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT(Flags::enableMoveToNextDisplayShortcut, true,

    ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT(Flags::enableMoveToNextDisplayShortcut, true,

            Flags.FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT),

            Flags.FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT),

    ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE(Flags::enableMultidisplayTrackpadBackGesture, false,

    ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE(Flags::enableMultidisplayTrackpadBackGesture, true,

            Flags.FLAG_ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE),

            Flags.FLAG_ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE),

    ENABLE_MULTIPLE_DESKTOPS_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS(

    ENABLE_MULTIPLE_DESKTOPS_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS(

            Flags::enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays, false,

            Flags::enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays, false,

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_DEFAULT_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS),

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_DEFAULT_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS),

    ENABLE_MULTIPLE_DESKTOPS_BACKEND(Flags::enableMultipleDesktopsBackend, false,

    ENABLE_MULTIPLE_DESKTOPS_BACKEND(Flags::enableMultipleDesktopsBackend, true,

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND),

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND),

    ENABLE_MULTIPLE_DESKTOPS_FRONTEND(Flags::enableMultipleDesktopsFrontend, false,

    ENABLE_MULTIPLE_DESKTOPS_FRONTEND(Flags::enableMultipleDesktopsFrontend, false,

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND),

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND),
@@ -134,18 +134,18 @@ public enum DesktopExperienceFlags { 
            Flags::enablePersistingDisplaySizeForConnectedDisplays, true,

            Flags::enablePersistingDisplaySizeForConnectedDisplays, true,

            Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS),

            Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS),

    ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY(Flags::enablePerDisplayDesktopWallpaperActivity,

    ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY(Flags::enablePerDisplayDesktopWallpaperActivity,

            false, Flags.FLAG_ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY),

            true, Flags.FLAG_ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY),

    ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS(Flags::enablePresentationForConnectedDisplays, true,

    ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS(Flags::enablePresentationForConnectedDisplays, true,

            Flags.FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS),

            Flags.FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS),

    ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE(Flags::enableProjectedDisplayDesktopMode, false,

    ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE(Flags::enableProjectedDisplayDesktopMode, true,

            Flags.FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE),

            Flags.FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE),

    ENABLE_REJECT_HOME_TRANSITION(

    ENABLE_REJECT_HOME_TRANSITION(

            Flags::enableRejectHomeTransition, false,

            Flags::enableRejectHomeTransition, false,

            Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION),

            Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION),

    ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS(Flags::enableRestartMenuForConnectedDisplays, false,

    ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS(Flags::enableRestartMenuForConnectedDisplays, true,

            Flags.FLAG_ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS),

            Flags.FLAG_ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS),

    ENABLE_SEE_THROUGH_TASK_FRAGMENTS(Flags::enableSeeThroughTaskFragments,

    ENABLE_SEE_THROUGH_TASK_FRAGMENTS(Flags::enableSeeThroughTaskFragments,

            false, Flags.FLAG_ENABLE_SEE_THROUGH_TASK_FRAGMENTS),

            true, Flags.FLAG_ENABLE_SEE_THROUGH_TASK_FRAGMENTS),

    ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS(

    ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS(

            Flags::enableSizeCompatModeImprovementsForConnectedDisplays, true,

            Flags::enableSizeCompatModeImprovementsForConnectedDisplays, true,

            Flags.FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS),

            Flags.FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS),
@@ -155,11 +155,11 @@ public enum DesktopExperienceFlags { 
    ENABLE_TASKBAR_CONNECTED_DISPLAYS(Flags::enableTaskbarConnectedDisplays, true,

    ENABLE_TASKBAR_CONNECTED_DISPLAYS(Flags::enableTaskbarConnectedDisplays, true,

            Flags.FLAG_ENABLE_TASKBAR_CONNECTED_DISPLAYS),

            Flags.FLAG_ENABLE_TASKBAR_CONNECTED_DISPLAYS),

    ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS(

    ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS(

            Flags::enableWindowingTransitionHandlersObservers, false,

            Flags::enableWindowingTransitionHandlersObservers, true,

            Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS),

            Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS),

    ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS(Flags::enterDesktopByDefaultOnFreeformDisplays,

    ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS(Flags::enterDesktopByDefaultOnFreeformDisplays,

            true, Flags.FLAG_ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS),

            true, Flags.FLAG_ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS),

    FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH(Flags::formFactorBasedDesktopFirstSwitch, false,

    FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH(Flags::formFactorBasedDesktopFirstSwitch, true,

            Flags.FLAG_FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH),

            Flags.FLAG_FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH),

    REPARENT_WINDOW_TOKEN_API(Flags::reparentWindowTokenApi, true,

    REPARENT_WINDOW_TOKEN_API(Flags::reparentWindowTokenApi, true,

            Flags.FLAG_REPARENT_WINDOW_TOKEN_API)

            Flags.FLAG_REPARENT_WINDOW_TOKEN_API)

libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ public class ShellController { 
    private static final String TAG = ShellController.class.getSimpleName();

    private static final String TAG = ShellController.class.getSimpleName();





    public static final DesktopExperienceFlag FIX_MISSING_USER_CHANGE_CALLBACKS_FLAG =

    public static final DesktopExperienceFlag FIX_MISSING_USER_CHANGE_CALLBACKS_FLAG =

            new DesktopExperienceFlag(Flags::fixMissingUserChangeCallbacks, false,

            new DesktopExperienceFlag(Flags::fixMissingUserChangeCallbacks, true,

                    Flags.FLAG_FIX_MISSING_USER_CHANGE_CALLBACKS);

                    Flags.FLAG_FIX_MISSING_USER_CHANGE_CALLBACKS);





    private final Context mContext;

    private final Context mContext;