From a26b4b892b8ebf03f21ee19a6a26a7302883af44 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Wed, 21 Jun 2023 14:33:22 -0700 Subject: [PATCH] Removing some shortcut mappings that didn't make to UDC in system info Bug: 288319976 Test: N/A Change-Id: I5ab2d50d84c7d2d13d5ceedc9c5113cfae017c09 --- .../statusbar/KeyboardShortcutListSearch.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java index 06f43f1eeaa58..906c5ed0fb89e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java @@ -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++) {