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

Merge "Handle Home shortcut in PhoneWindowManager and back in native" into udc-dev

Browse Source
This commit is contained in:
Vaibhav Devmurari
2023-03-06 10:46:22 +00:00
committed by Android (Google) Code Review
parent dd887408f2 db92f29b6c
commit 5ed761ef8a
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2977,7 +2977,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
break; break;
case KeyEvent.KEYCODE_H: case KeyEvent.KEYCODE_H:
if (down && event.isMetaPressed()) { if (event.isMetaPressed()) {
return handleHomeShortcuts(displayId, focusedToken, event); return handleHomeShortcuts(displayId, focusedToken, event);
} }
break; break;
@@ -3018,11 +3018,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (down && event.isMetaPressed() && event.isCtrlPressed() && repeatCount == 0) { if (down && event.isMetaPressed() && event.isCtrlPressed() && repeatCount == 0) {
enterStageSplitFromRunningApp(true /* leftOrTop */); enterStageSplitFromRunningApp(true /* leftOrTop */);
return key_consumed; return key_consumed;
} else if (!down && event.isMetaPressed()) {
boolean backKeyHandled = backKeyPress();
if (backKeyHandled) {
return key_consumed;
}
} }
break; break;
case KeyEvent.KEYCODE_DPAD_RIGHT: case KeyEvent.KEYCODE_DPAD_RIGHT:
@@ -3031,14 +3026,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return key_consumed; return key_consumed;
} }
break; break;
case KeyEvent.KEYCODE_GRAVE:
if (!down && event.isMetaPressed()) {
boolean backKeyHandled = backKeyPress();
if (backKeyHandled) {
return key_consumed;
}
}
break;
case KeyEvent.KEYCODE_SLASH: case KeyEvent.KEYCODE_SLASH:
if (down && repeatCount == 0 && event.isMetaPressed() && !keyguardOn) { if (down && repeatCount == 0 && event.isMetaPressed() && !keyguardOn) {
toggleKeyboardShortcutsMenu(event.getDeviceId()); toggleKeyboardShortcutsMenu(event.getDeviceId());