Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow ATV Keychord to turn on/off talkback"

Browse Source
This commit is contained in:
Joshua Lambert
2018-09-17 20:41:56 +00:00
committed by Android (Google) Code Review
parent 3f2486de70 1e12d4678c
commit 665f5b9b09
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3543,8 +3543,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return 0;
} else if (mHasFeatureLeanback && interceptBugreportGestureTv(keyCode, down)) {
return -1;
} else if (mHasFeatureLeanback && interceptAccessibilityGestureTv(keyCode, down)) {
return -1;
} else if (keyCode == KeyEvent.KEYCODE_ALL_APPS) {
if (!down) {
mHandler.removeMessages(MSG_HANDLE_ALL_APPS);
@@ -6037,6 +6035,22 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
// Intercept the Accessibility keychord for TV (DPAD_DOWN + Back) before the keyevent is
// processed through interceptKeyEventBeforeDispatch since Talkback may consume this event
// before it has a chance to reach that method.
if (mHasFeatureLeanback) {
switch (keyCode) {
case KeyEvent.KEYCODE_DPAD_DOWN:
case KeyEvent.KEYCODE_BACK: {
boolean handled = interceptAccessibilityGestureTv(keyCode, down);
if (handled) {
result &= ~ACTION_PASS_TO_USER;
}
break;
}
}
}
if (useHapticFeedback) {
performHapticFeedbackLw(null, HapticFeedbackConstants.VIRTUAL_KEY, false,
"Virtual Key - Press");