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

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

Merge "Add flag for close fullscreen/split-screen shortcut" into main

parents 18e01a69 9b4f48f5

core/java/android/window/DesktopExperienceFlags.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,9 @@ public enum DesktopExperienceFlags { 
    BASE_DENSITY_FOR_EXTERNAL_DISPLAYS(

    BASE_DENSITY_FOR_EXTERNAL_DISPLAYS(

            com.android.server.display.feature.flags.Flags::baseDensityForExternalDisplays, true,

            com.android.server.display.feature.flags.Flags::baseDensityForExternalDisplays, true,

            com.android.server.display.feature.flags.Flags.FLAG_BASE_DENSITY_FOR_EXTERNAL_DISPLAYS),

            com.android.server.display.feature.flags.Flags.FLAG_BASE_DENSITY_FOR_EXTERNAL_DISPLAYS),

    CLOSE_FULLSCREEN_AND_SPLITSCREEN_KEYBOARD_SHORTCUT(

            Flags::closeFullscreenAndSplitscreenKeyboardShortcut, false,

            Flags.FLAG_CLOSE_FULLSCREEN_AND_SPLITSCREEN_KEYBOARD_SHORTCUT),

    CLOSE_TASK_KEYBOARD_SHORTCUT(Flags::closeTaskKeyboardShortcut, true,

    CLOSE_TASK_KEYBOARD_SHORTCUT(Flags::closeTaskKeyboardShortcut, true,

            Flags.FLAG_CLOSE_TASK_KEYBOARD_SHORTCUT),

            Flags.FLAG_CLOSE_TASK_KEYBOARD_SHORTCUT),

    CONNECTED_DISPLAYS_CURSOR(com.android.input.flags.Flags::connectedDisplaysCursor, true,

    CONNECTED_DISPLAYS_CURSOR(com.android.input.flags.Flags::connectedDisplaysCursor, true,

core/java/android/window/flags/lse_desktop_experience.aconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,13 @@ flag { 
    }

    }

}

}





flag {

    name: "close_fullscreen_and_splitscreen_keyboard_shortcut"

    namespace: "lse_desktop_experience"

    description: "Enable keyboard shortcut to close fullscreen and split screen tasks"

    bug: "441147192"

}



flag {

flag {

    name: "close_task_keyboard_shortcut"

    name: "close_task_keyboard_shortcut"

    namespace: "lse_desktop_experience"

    namespace: "lse_desktop_experience"