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

Merge "Ensure accessibility node cache is synced with service state" into klp-dev

Browse Source
This commit is contained in:
Alan Viverette
2013-10-10 18:19:24 +00:00
committed by Android (Google) Code Review
parent a619afd659 3d1c5a7236
commit 90abd6d1df
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/accessibility/AccessibilityNodeInfoCache.java
View File

@@ -67,11 +67,12 @@ public class AccessibilityNodeInfoCache {
if (ENABLED) { if (ENABLED) {
final int eventType = event.getEventType(); final int eventType = event.getEventType();
switch (eventType) { switch (eventType) {
case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END:
case AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED: case AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED:
case AccessibilityEvent.TYPE_VIEW_HOVER_ENTER: case AccessibilityEvent.TYPE_VIEW_HOVER_ENTER:
case AccessibilityEvent.TYPE_VIEW_HOVER_EXIT: { case AccessibilityEvent.TYPE_VIEW_HOVER_EXIT: {
// If the active window changes, clear the cache.
final int windowId = event.getWindowId(); final int windowId = event.getWindowId();
// If a new window, we clear the cache.
if (mWindowId != windowId) { if (mWindowId != windowId) {
mWindowId = windowId; mWindowId = windowId;
clear(); clear();

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

@@ -736,9 +736,9 @@ class TouchExplorer implements EventStreamTransformation {
+ "there is at least one pointer down!"); + "there is at least one pointer down!");
} }
case MotionEvent.ACTION_UP: { case MotionEvent.ACTION_UP: {
mAms.onTouchInteractionEnd();
// Announce the end of a the touch interaction. // Announce the end of a the touch interaction.
sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);
mAms.onTouchInteractionEnd();
mLongPressingPointerId = -1; mLongPressingPointerId = -1;
mLongPressingPointerDeltaX = 0; mLongPressingPointerDeltaX = 0;
mLongPressingPointerDeltaY = 0; mLongPressingPointerDeltaY = 0;
@@ -822,6 +822,7 @@ class TouchExplorer implements EventStreamTransformation {
AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(mContext); AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(mContext);
if (accessibilityManager.isEnabled()) { if (accessibilityManager.isEnabled()) {
AccessibilityEvent event = AccessibilityEvent.obtain(type); AccessibilityEvent event = AccessibilityEvent.obtain(type);
event.setWindowId(mAms.getActiveWindowId());
accessibilityManager.sendAccessibilityEvent(event); accessibilityManager.sendAccessibilityEvent(event);
switch (type) { switch (type) {
case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START: { case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START: {