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

Merge "Turning off accessibility feature reboots the device"

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-08-08 06:50:19 -07:00
committed by Android (Google) Code Review
parent 03b2ea1102 3e4e4af452
commit 74b551aae5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,11 @@ public class AccessibilityInputFilter extends InputFilter {
* @param policyFlags The policy flags associated with the event.
*/
public void clear(MotionEvent event, int policyFlags);
/**
* Requests that the explorer clears its internal state.
*/
public void clear();
}
private TouchExplorer mTouchExplorer;
@@ -71,6 +76,7 @@ public class AccessibilityInputFilter extends InputFilter {
if (DEBUG) {
Slog.d(TAG, "Accessibility input filter installed.");
}
mTouchExplorer = new TouchExplorer(this, mContext);
super.onInstalled();
}
@@ -79,6 +85,7 @@ public class AccessibilityInputFilter extends InputFilter {
if (DEBUG) {
Slog.d(TAG, "Accessibility input filter uninstalled.");
}
mTouchExplorer.clear();
super.onUninstalled();
}
@@ -93,11 +100,7 @@ public class AccessibilityInputFilter extends InputFilter {
int deviceId = event.getDeviceId();
if (mTouchscreenSourceDeviceId != deviceId) {
mTouchscreenSourceDeviceId = deviceId;
if (mTouchExplorer != null) {
mTouchExplorer.clear(motionEvent, policyFlags);
} else {
mTouchExplorer = new TouchExplorer(this, mContext);
}
mTouchExplorer.clear(motionEvent, policyFlags);
}
if ((policyFlags & WindowManagerPolicy.FLAG_PASS_TO_USER) != 0) {
mTouchExplorer.onMotionEvent(motionEvent, policyFlags);

3
services/java/com/android/server/accessibility/TouchExplorer.java
View File

@@ -858,8 +858,9 @@ public class TouchExplorer implements Explorer {
/**
* Clears the internal state of this explorer.
*/
private void clear() {
public void clear() {
mSendHoverDelayed.remove();
mPerformLongPressDelayed.remove();
mPointerTracker.clear();
mLastTouchExploreEvent = null;
mCurrentState = STATE_TOUCH_EXPLORING;