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

Commit 4922a290 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Removing some shortcut mappings that didn't make to UDC in system info"... 

Merge "Removing some shortcut mappings that didn't make to UDC in system info" into udc-dev am: dc3a5f1e am: 0643986d am: f4fc00db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23771395



Change-Id: Ia1392f738e311dac2c611e9ac94a503925b42030
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05da66b2 f4fc00db

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

+1 −22
Original line number Diff line number Diff line
@@ -557,19 +557,7 @@ public final class KeyboardShortcutListSearch { 
                new ShortcutKeyGroupMultiMappingInfo(

                        context.getString(R.string.group_system_access_google_assistant),

                        Arrays.asList(

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

                /*  Lock screen: Meta + L */

                new ShortcutKeyGroupMultiMappingInfo(

                        context.getString(R.string.group_system_lock_screen),

                        Arrays.asList(

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

                /* Pull up Notes app for quick memo: Meta + Ctrl + N */

                new ShortcutKeyGroupMultiMappingInfo(

                        context.getString(R.string.group_system_quick_memo),

                        Arrays.asList(

                                Pair.create(

                                        KeyEvent.KEYCODE_N,

                                        KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON)))

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

        );

        for (ShortcutKeyGroupMultiMappingInfo info : infoList) {

            systemGroup.addItem(info.getShortcutMultiMappingInfo());
@@ -611,21 +599,12 @@ public final class KeyboardShortcutListSearch { 
                        new ArrayList<>());



        // System multitasking shortcuts:

        //    Enter Split screen with current app to RHS: Meta + Ctrl + Right arrow

        //    Enter Split screen with current app to LHS: Meta + Ctrl + Left arrow

        //    Switch from Split screen to full screen: Meta + Ctrl + Up arrow

        //    During Split screen: replace an app from one to another: Meta + Ctrl + Down arrow

        String[] shortcutLabels = {

                context.getString(R.string.system_multitasking_rhs),

                context.getString(R.string.system_multitasking_lhs),

                context.getString(R.string.system_multitasking_full_screen),

                context.getString(R.string.system_multitasking_replace)

        };

        int[] keyCodes = {

                KeyEvent.KEYCODE_DPAD_RIGHT,

                KeyEvent.KEYCODE_DPAD_LEFT,

                KeyEvent.KEYCODE_DPAD_UP,

                KeyEvent.KEYCODE_DPAD_DOWN

        };



        for (int i = 0; i < shortcutLabels.length; i++) {