Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 075bd752 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Automerger Merge Worker
Browse files

Merge "Add support for KEYCODE_LANGUAGE_SWITCH to switch keyboard layout" into... 

Merge "Add support for KEYCODE_LANGUAGE_SWITCH to switch keyboard layout" into udc-dev am: 8d456fbf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22139442



Change-Id: Iccae1d17e9b2514f9c835bc74d785c26b4755ddd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c25ccc3 8d456fbf

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

+7 −0
Original line number Diff line number Diff line
@@ -3183,6 +3183,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    }

                }

                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) {