Merge "Do not intercept LANGUAGE_SWITCH in the framework layer" am: fc96f8b5fb am: 88d85d326c am: eb6dfbbeac

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

Change-Id: I042a19a8fec0a55f67878723fc055a86bf0d8a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Josep del Río
2022-10-20 16:28:34 +00:00
committed by Automerger Merge Worker

View File

@@ -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);