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

Commit 2aeb7fcf authored by Joshua Mokut's avatar Joshua Mokut Committed by Android (Google) Code Review
Browse files

Merge "updated string for multitasking shortcut" into main

parents 6910bc21 7372f968

packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/source/TestShortcuts.kt

+3 −3
Original line number Diff line number Diff line
@@ -543,12 +543,12 @@ object TestShortcuts { 
            simpleShortcutCategory(

                MultiTasking,

                "Split screen",

                "Switch from split screen to full screen",

                "Switch to full screen",

            ),

            simpleShortcutCategory(

                MultiTasking,

                "Split screen",

                "Use split screen with current app on the left",

                "Use split screen with app on the left",

            ),

            simpleShortcutCategory(

                MultiTasking,
@@ -558,7 +558,7 @@ object TestShortcuts { 
            simpleShortcutCategory(

                MultiTasking,

                "Split screen",

                "Use split screen with current app on the right",

                "Use split screen with app on the right",

            ),

            simpleShortcutCategory(

                MultiTasking,

packages/SystemUI/res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -2282,11 +2282,11 @@ 
    <!-- User visible title for the multitasking keyboard shortcuts list. [CHAR LIMIT=70] -->

    <string name="keyboard_shortcut_group_system_multitasking">Multitasking</string>

    <!-- User visible title for the keyboard shortcut that enters split screen with current app on the right [CHAR LIMIT=70] -->

    <string name="system_multitasking_rhs">Use split screen with current app on the right</string>

    <string name="system_multitasking_rhs">Use split screen with app on the right</string>

    <!-- User visible title for the keyboard shortcut that enters split screen with current app on the left [CHAR LIMIT=70] -->

    <string name="system_multitasking_lhs">Use split screen with current app on the left</string>

    <string name="system_multitasking_lhs">Use split screen with app on the left</string>

    <!-- User visible title for the keyboard shortcut that switches from split screen to full screen [CHAR LIMIT=70] -->

    <string name="system_multitasking_full_screen">Switch from split screen to full screen</string>

    <string name="system_multitasking_full_screen">Switch to full screen</string>

    <!-- User visible title for the keyboard shortcut that switches to app on right or below while using split screen [CHAR LIMIT=70] -->

    <string name="system_multitasking_splitscreen_focus_rhs">Switch to app on right or below while using split screen</string>

    <!-- User visible title for the keyboard shortcut that switches to app on left or above while using split screen [CHAR LIMIT=70] -->