diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-10 11:28:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 11:28:43 -0700 |
| commit | 46b2cc1323c643a5f199dca7584bdd8811563c3e (patch) | |
| tree | f7d8a8adff77b0c84b4b5069d939429ef833dbd9 | |
| parent | aba437d9ba2d7f7e1bc89cc46479a64cc1bf006c (diff) | |
| parent | 66b5b5b2b74baa9b7c26d5d72eaa2b6f9f5675dc (diff) | |
| download | frameworks_base-46b2cc1323c643a5f199dca7584bdd8811563c3e.zip frameworks_base-46b2cc1323c643a5f199dca7584bdd8811563c3e.tar.gz frameworks_base-46b2cc1323c643a5f199dca7584bdd8811563c3e.tar.bz2 | |
am 66b5b5b2: am cb38a97c: am 90abd6d1: Merge "Ensure accessibility node cache is synced with service state" into klp-dev
* commit '66b5b5b2b74baa9b7c26d5d72eaa2b6f9f5675dc':
Ensure accessibility node cache is synced with service state
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityNodeInfoCache.java | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/accessibility/TouchExplorer.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java b/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java index 7dd1e8a..a9473a8 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java @@ -67,11 +67,12 @@ public class AccessibilityNodeInfoCache { if (ENABLED) { final int eventType = event.getEventType(); switch (eventType) { + case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END: case AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED: case AccessibilityEvent.TYPE_VIEW_HOVER_ENTER: case AccessibilityEvent.TYPE_VIEW_HOVER_EXIT: { + // If the active window changes, clear the cache. final int windowId = event.getWindowId(); - // If a new window, we clear the cache. if (mWindowId != windowId) { mWindowId = windowId; clear(); diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/java/com/android/server/accessibility/TouchExplorer.java index 1b8876d..a99b58a 100644 --- a/services/java/com/android/server/accessibility/TouchExplorer.java +++ b/services/java/com/android/server/accessibility/TouchExplorer.java @@ -736,9 +736,9 @@ class TouchExplorer implements EventStreamTransformation { + "there is at least one pointer down!"); } case MotionEvent.ACTION_UP: { + mAms.onTouchInteractionEnd(); // Announce the end of a the touch interaction. sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); - mAms.onTouchInteractionEnd(); mLongPressingPointerId = -1; mLongPressingPointerDeltaX = 0; mLongPressingPointerDeltaY = 0; @@ -822,6 +822,7 @@ class TouchExplorer implements EventStreamTransformation { AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(mContext); if (accessibilityManager.isEnabled()) { AccessibilityEvent event = AccessibilityEvent.obtain(type); + event.setWindowId(mAms.getActiveWindowId()); accessibilityManager.sendAccessibilityEvent(event); switch (type) { case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START: { |