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 am: 5ed761ef8a

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

Change-Id: Iafa6b92baa38f7478b5f9de7d91235ea79ff13ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vaibhav Devmurari
2023-03-06 11:38:02 +00:00
committed by Automerger Merge Worker
parent 89447789b9 5ed761ef8a
commit a0b4cb87b8
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;
case KeyEvent.KEYCODE_H:
if (down && event.isMetaPressed()) {
if (event.isMetaPressed()) {
return handleHomeShortcuts(displayId, focusedToken, event);
}
break;
@@ -3018,11 +3018,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (down && event.isMetaPressed() && event.isCtrlPressed() && repeatCount == 0) {
enterStageSplitFromRunningApp(true /* leftOrTop */);
return key_consumed;
} else if (!down && event.isMetaPressed()) {
boolean backKeyHandled = backKeyPress();
if (backKeyHandled) {
return key_consumed;
}
}
break;
case KeyEvent.KEYCODE_DPAD_RIGHT:
@@ -3031,14 +3026,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return key_consumed;
}
break;
case KeyEvent.KEYCODE_GRAVE:
if (!down && event.isMetaPressed()) {
boolean backKeyHandled = backKeyPress();
if (backKeyHandled) {
return key_consumed;
}
}
break;
case KeyEvent.KEYCODE_SLASH:
if (down && repeatCount == 0 && event.isMetaPressed() && !keyguardOn) {
toggleKeyboardShortcutsMenu(event.getDeviceId());