commit 246682f16447a52c4ce62bcf2c4fa37ef6d23af6
author Vaibhav Devmurari <vdevmurari@google.com> Fri Mar 17 13:45:03 2023 +0000
committer Vaibhav Devmurari <vdevmurari@google.com> Fri Mar 17 13:45:03 2023 +0000
tree e149d191ea377f2233cb89937566ae6b56022a5d
parent 10be070b98124b7681e95a3c43bf830367990428

Add support for KEYCODE_LANGUAGE_SWITCH to switch keyboard layout

Test: manual
Bug: 274096186
Change-Id: I733025e0fc67db71dfe12da54ecfeb6bb563d405

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 ea53ea5..3eeafeb 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3183,6 +3183,13 @@
                     }
                 }
                 break;
+            case KeyEvent.KEYCODE_LANGUAGE_SWITCH:
+                if (down && repeatCount == 0) {
+                    int direction = (metaState & KeyEvent.META_SHIFT_MASK) != 0 ? -1 : 1;
+                    sendSwitchKeyboardLayout(event, direction);
+                    return key_consumed;
+                }
+                break;
             case KeyEvent.KEYCODE_SPACE:
                 // Handle keyboard layout switching. (META + SPACE)
                 if ((metaState & KeyEvent.META_META_MASK) == 0) {