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

Commit 4d8558bf authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.0' into a16

parents 0568c609 87a08338

services/core/java/com/android/server/input/KeyGestureController.java

+3 −2
Original line number Diff line number Diff line
@@ -842,8 +842,9 @@ final class KeyGestureController { 
                }

                return true;

            case KeyEvent.KEYCODE_ASSIST:

                Slog.wtf(TAG, "KEYCODE_ASSIST should be handled in interceptKeyBeforeQueueing");

                return true;

            case KeyEvent.KEYCODE_MENU:

                // Let policy handle it in PhoneWindowManager.interceptKeyBeforeQueueing

                return false;

            case KeyEvent.KEYCODE_VOICE_ASSIST:

                Slog.wtf(TAG, "KEYCODE_VOICE_ASSIST should be handled in"

                        + " interceptKeyBeforeQueueing");

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

+3 −0
Original line number Diff line number Diff line
@@ -4634,6 +4634,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        final int metaState = event.getMetaState();



        switch (keyCode) {

            case KeyEvent.KEYCODE_ASSIST:

            case KeyEvent.KEYCODE_MENU:

                return interceptSystemKeysAndShortcutsOld(focusedToken, event);

            case KeyEvent.KEYCODE_HOME:

                return handleHomeShortcuts(focusedToken, event);

            case KeyEvent.KEYCODE_VOLUME_UP: