Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iec6303a02a918f8e0bb73082b2a9ccf26a2b3b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2023-06-28 00:23:52 +00:00
committed by Automerger Merge Worker
parent 9754a915e9 dc3a5f1e1a
commit 0643986db5
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java
View File

@@ -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++) {