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

Merge "Only filter a11y motion events if needed." into nyc-mr1-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-08-05 00:37:17 +00:00
committed by Android (Google) Code Review
parent f32b03d124 dc5dedeaa2
commit 6f20514185
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
View File

@@ -77,6 +77,9 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo
*/ */
static final int FLAG_FEATURE_INJECT_MOTION_EVENTS = 0x00000010; static final int FLAG_FEATURE_INJECT_MOTION_EVENTS = 0x00000010;
static final int FEATURES_AFFECTING_MOTION_EVENTS = FLAG_FEATURE_INJECT_MOTION_EVENTS
| FLAG_FEATURE_AUTOCLICK | FLAG_FEATURE_TOUCH_EXPLORATION
| FLAG_FEATURE_SCREEN_MAGNIFIER;
/** /**
* Flag for enabling the feature to control the screen magnifier. If * Flag for enabling the feature to control the screen magnifier. If
* {@link #FLAG_FEATURE_SCREEN_MAGNIFIER} is set this flag is ignored * {@link #FLAG_FEATURE_SCREEN_MAGNIFIER} is set this flag is ignored
@@ -203,8 +206,13 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo
} }
if (event instanceof MotionEvent) { if (event instanceof MotionEvent) {
MotionEvent motionEvent = (MotionEvent) event; if ((mEnabledFeatures & FEATURES_AFFECTING_MOTION_EVENTS) != 0) {
processMotionEvent(state, motionEvent, policyFlags); MotionEvent motionEvent = (MotionEvent) event;
processMotionEvent(state, motionEvent, policyFlags);
return;
} else {
super.onInputEvent(event, policyFlags);
}
} else if (event instanceof KeyEvent) { } else if (event instanceof KeyEvent) {
KeyEvent keyEvent = (KeyEvent) event; KeyEvent keyEvent = (KeyEvent) event;
processKeyEvent(state, keyEvent, policyFlags); processKeyEvent(state, keyEvent, policyFlags);