Merge "Do not intercept LANGUAGE_SWITCH in the framework layer"
This commit is contained in:
@@ -2944,8 +2944,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);
|
||||||
|
|||||||
Reference in New Issue
Block a user