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

Commit 4e414ca0 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Map META+L to lock the device" into udc-qpr-dev am: 017cdf10 

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



Change-Id: Iefccbd94e405d7a4aeae516e4275577c46e02de6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6402bd80 017cdf10

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

+6 −0
Original line number Diff line number Diff line
@@ -3046,6 +3046,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    return key_consumed;

                }

                break;

            case KeyEvent.KEYCODE_L:

                if (down && event.isMetaPressed() && repeatCount == 0) {

                    lockNow(null /* options */);

                    return key_consumed;

                }

                break;

            case KeyEvent.KEYCODE_N:

                if (down && event.isMetaPressed()) {

                    if (event.isCtrlPressed()) {