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

Commit 53a31c05 authored by Lynn Yeh's avatar Lynn Yeh Committed by Android (Google) Code Review
Browse files

Merge "Remove Meta+T shortcut" into 24D1-dev

parents ed0aa700 5ffce634

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -1954,8 +1954,6 @@ 
    <string name="group_system_cycle_back">Cycle backward through recent apps</string>

    <!-- User visible title for the keyboard shortcut that accesses list of all apps and search. [CHAR LIMIT=70] -->

    <string name="group_system_access_all_apps_search">Open apps list</string>

    <!-- User visible title for the keyboard shortcut that hides and (re)showes taskbar. [CHAR LIMIT=70] -->

    <string name="group_system_hide_reshow_taskbar">Show taskbar</string>

    <!-- User visible title for the keyboard shortcut that accesses [system] settings. [CHAR LIMIT=70] -->

    <string name="group_system_access_system_settings">Open settings</string>

    <!-- User visible title for the keyboard shortcut that accesses Assistant app. [CHAR LIMIT=70] -->

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

+0 −5
Original line number Diff line number Diff line
@@ -530,11 +530,6 @@ public final class KeyboardShortcutListSearch { 
                                Pair.create(

                                        KeyEvent.KEYCODE_TAB,

                                        KeyEvent.META_SHIFT_ON | KeyEvent.META_ALT_ON))),

                /* Hide and (re)show taskbar: Meta + T */

                new ShortcutKeyGroupMultiMappingInfo(

                        context.getString(R.string.group_system_hide_reshow_taskbar),

                        Arrays.asList(

                                Pair.create(KeyEvent.KEYCODE_T, KeyEvent.META_META_ON))),

                /* Access notification shade: Meta + N */

                new ShortcutKeyGroupMultiMappingInfo(

                        context.getString(R.string.group_system_access_notification_shade),

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −7
Original line number Diff line number Diff line
@@ -3495,13 +3495,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    return true;

                }

                break;

            case KeyEvent.KEYCODE_T:

                if (firstDown && event.isMetaPressed()) {

                    toggleTaskbar();

                    logKeyboardSystemsEvent(event, KeyboardLogEvent.TOGGLE_TASKBAR);

                    return true;

                }

                break;

            case KeyEvent.KEYCODE_DEL:

            case KeyEvent.KEYCODE_ESCAPE:

                if (firstDown && event.isMetaPressed()) {

services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ public class ShortcutLoggingTests extends ShortcutKeyTestBase { 
                        new int[]{KeyEvent.KEYCODE_NOTIFICATION},

                        KeyboardLogEvent.TOGGLE_NOTIFICATION_PANEL, KeyEvent.KEYCODE_NOTIFICATION,

                        0},

                {"Meta + T -> Toggle Taskbar", new int[]{META_KEY, KeyEvent.KEYCODE_T},

                        KeyboardLogEvent.TOGGLE_TASKBAR, KeyEvent.KEYCODE_T, META_ON},

                {"Meta + Ctrl + S -> Take Screenshot",

                        new int[]{META_KEY, CTRL_KEY, KeyEvent.KEYCODE_S},

                        KeyboardLogEvent.TAKE_SCREENSHOT, KeyEvent.KEYCODE_S, META_ON | CTRL_ON},