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

Commit e6e28da0 authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "Do not intercept LANGUAGE_SWITCH in the framework layer" am: fc96f8b5... 

Merge "Do not intercept LANGUAGE_SWITCH in the framework layer" am: fc96f8b5 am: 88d85d32 am: eb6dfbbe

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



Change-Id: I042a19a8fec0a55f67878723fc055a86bf0d8a1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f0ffb2c eb6dfbbe

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

+0 −2
Original line number Diff line number Diff line
@@ -2999,8 +2999,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                if ((metaState & KeyEvent.META_META_MASK) == 0) {

                    return key_not_consumed;

                }

                // Share the same behavior with KEYCODE_LANGUAGE_SWITCH.

            case KeyEvent.KEYCODE_LANGUAGE_SWITCH:

                if (down && repeatCount == 0) {

                    int direction = (metaState & KeyEvent.META_SHIFT_MASK) != 0 ? -1 : 1;

                    mWindowManagerFuncs.switchKeyboardLayout(event.getDeviceId(), direction);