Merge "Do not intercept LANGUAGE_SWITCH in the framework layer" am: fc96f8b5fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263101 Change-Id: Ia160cc916cadda9212bd2fe78dfc7c01fe3ef4b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2945,8 +2945,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
|
|||||||
if ((metaState & KeyEvent.META_META_MASK) == 0) {
|
if ((metaState & KeyEvent.META_META_MASK) == 0) {
|
||||||
return key_not_consumed;
|
return key_not_consumed;
|
||||||
}
|
}
|
||||||
// Share the same behavior with KEYCODE_LANGUAGE_SWITCH.
|
|
||||||
case KeyEvent.KEYCODE_LANGUAGE_SWITCH:
|
|
||||||
if (down && repeatCount == 0) {
|
if (down && repeatCount == 0) {
|
||||||
int direction = (metaState & KeyEvent.META_SHIFT_MASK) != 0 ? -1 : 1;
|
int direction = (metaState & KeyEvent.META_SHIFT_MASK) != 0 ? -1 : 1;
|
||||||
mWindowManagerFuncs.switchKeyboardLayout(event.getDeviceId(), direction);
|
mWindowManagerFuncs.switchKeyboardLayout(event.getDeviceId(), direction);
|
||||||
|
|||||||
Reference in New Issue
Block a user