commit 8558b6c74b8ce1ee104b944df0ca4e19a4027458
author Josep del Río <joseprio@google.com> Thu Oct 20 09:33:35 2022 +0000
committer Josep del Río <joseprio@google.com> Thu Oct 20 09:33:35 2022 +0000
tree e4dd60054ff8b3f5f7e2a53d09998df7d94e1ac6
parent 773e4ebf94091477f9e1ecf405ec7dac4d4d7c85

Revert "Do not intercept LANGUAGE_SWITCH in the framework layer"

This reverts commit 773e4ebf94091477f9e1ecf405ec7dac4d4d7c85.

Reason for revert: Needs to be marged in aosp

Change-Id: Ifb7992f3d79a520f146586a624e9d5b36c88a252

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

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index d39b649..ae99806 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2999,6 +2999,8 @@
                 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);