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

Commit a7011571 authored by Chris Göllner's avatar Chris Göllner
Browse files

Shortcut Helper - Make sure "Esc" is using a localized string 

Flag: EXEMPT trivial
Test: Manually
Fixes: 329139612
Change-Id: I00aa41ff56ea340228a5753557b34caab38af806
parent 5627a898

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2038,6 +2038,8 @@ 
    <string name="keyboard_key_page_down">Page Down</string>

    <!-- Name used to refer to the "Delete" key on the keyboard. -->

    <string name="keyboard_key_forward_del">Delete</string>

    <!-- Name used to refer to the "Esc" or "Escape" key on the keyboard. -->

    <string name="keyboard_key_esc">Esc</string>

    <!-- Name used to refer to the "Home" move key on the keyboard. -->

    <string name="keyboard_key_move_home">Home</string>

    <!-- Name used to refer to the "End" move key on the keyboard. -->

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperKeys.kt

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ object ShortcutHelperKeys { 
                { context ->

                    context.getString(R.string.keyboard_key_forward_del)

                },

            KEYCODE_ESCAPE to { "Esc" },

            KEYCODE_ESCAPE to { context -> context.getString(R.string.keyboard_key_esc) },

            KEYCODE_SYSRQ to { "SysRq" },

            KEYCODE_BREAK to { "Break" },

            KEYCODE_SCROLL_LOCK to { "Scroll Lock" },

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java

+2 −1
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ public final class KeyboardShortcutListSearch { 
                context.getString(R.string.keyboard_key_button_template, "Mode"));

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_FORWARD_DEL, context.getString(R.string.keyboard_key_forward_del));

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_ESCAPE, "Esc");

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_ESCAPE, context.getString(R.string.keyboard_key_esc));

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_SYSRQ, "SysRq");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BREAK, "Break");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_SCROLL_LOCK, "Scroll Lock");

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+2 −1
Original line number Diff line number Diff line
@@ -259,7 +259,8 @@ public final class KeyboardShortcuts { 
                context.getString(R.string.keyboard_key_button_template, "Mode"));

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_FORWARD_DEL, context.getString(R.string.keyboard_key_forward_del));

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_ESCAPE, "Esc");

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_ESCAPE, context.getString(R.string.keyboard_key_esc));

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_SYSRQ, "SysRq");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BREAK, "Break");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_SCROLL_LOCK, "Scroll Lock");