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

Commit bbe5c501 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable flags needed for dev options" into main

parents 14917c9a 740c5b5f

core/java/android/window/DesktopExperienceFlags.java

+4 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION),

    ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH(

            com.android.server.display.feature.flags.Flags::enableDefaultDisplayInTopologySwitch,

            false, FLAG_ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH),

            true, FLAG_ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH),

    ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS(

            Flags::enableDesktopAppHeaderStateChangeAnnouncements, false,

            Flags.FLAG_ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS),
@@ -108,7 +108,7 @@ public enum DesktopExperienceFlags { 
    ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT(

            com.android.server.display.feature.flags.Flags::enableDisplayContentModeManagement,

            true, FLAG_ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT),

    ENABLE_DISPLAY_DISCONNECT_INTERACTION(Flags::enableDisplayDisconnectInteraction, false,

    ENABLE_DISPLAY_DISCONNECT_INTERACTION(Flags::enableDisplayDisconnectInteraction, true,

            Flags.FLAG_ENABLE_DISPLAY_DISCONNECT_INTERACTION),

    ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS(Flags::enableDisplayFocusInShellTransitions, true,

            Flags.FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS),
@@ -136,11 +136,11 @@ public enum DesktopExperienceFlags { 
    ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE(Flags::enableMultidisplayTrackpadBackGesture, true,

            Flags.FLAG_ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE),

    ENABLE_MULTIPLE_DESKTOPS_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS(

            Flags::enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays, false,

            Flags::enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays, true,

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_DEFAULT_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS),

    ENABLE_MULTIPLE_DESKTOPS_BACKEND(Flags::enableMultipleDesktopsBackend, true,

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND),

    ENABLE_MULTIPLE_DESKTOPS_FRONTEND(Flags::enableMultipleDesktopsFrontend, false,

    ENABLE_MULTIPLE_DESKTOPS_FRONTEND(Flags::enableMultipleDesktopsFrontend, true,

            Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND),

    ENABLE_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX(

            Flags::nestedTasksWithIndependentBoundsBugfix, false,