Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic520fac10e75a9b47a068f34c7f1052856b860d8
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 15:40:10 +00:00
committed by Automerger Merge Worker
parent f48a10c075 88d85d326c
commit eb6dfbbeac
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2943,8 +2943,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);