summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Josep del Río <joseprio@google.com> 2022-10-20 15:40:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-20 15:40:10 +0000
commiteb6dfbbeacfd04a1839297f90d734fa74d99af1a (patch)
treebd3d8d54dc5a76fb6725cbd0813cdf3ced5996b3
parentf48a10c0755012c6b321286c77ddb61a0869b520 (diff)
parent88d85d326c6fe872fad2836332b8f42538b433a8 (diff)
Merge "Do not intercept LANGUAGE_SWITCH in the framework layer" am: fc96f8b5fb am: 88d85d326c
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>
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 32ef014bbad7..f53505ed68a8 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2943,8 +2943,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);