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

Commit 64678b69 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

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



Change-Id: Ic686191b0fd68b813d9b66fa2b183325f4ad592b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a6da198 dc3a5f1e

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

+1 −22
Original line number Diff line number Diff line
@@ -534,19 +534,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());
@@ -588,21 +576,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++) {