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

Commit a3d4fbab authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Automerger Merge Worker
Browse files

Merge "Handle Home shortcut in PhoneWindowManager and back in native" into udc-dev am: 5ed761ef 

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



Change-Id: Ib1efbf5ff2e722364b6fb7fd39ce4884e6ba287a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33b7c8db 5ed761ef

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −14
Original line number Diff line number Diff line
@@ -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());