Merge "Cannot click on the last touch explored auto-completion item." into jb-dev

Author: sganov

services/java/com/android/server/accessibility/AccessibilityManagerService.java

@@ -588,6 +588,10 @@ void getActiveWindowBounds(Rect outBounds) {
         }
     }
 
+    int getActiveWindowId() {
+        return mSecurityPolicy.mActiveWindowId;
+    }
+
     private Service getQueryBridge() {
         if (mQueryBridge == null) {
             AccessibilityServiceInfo info = new AccessibilityServiceInfo();

services/java/com/android/server/accessibility/TouchExplorer.java

@@ -190,6 +190,9 @@ public class TouchExplorer {
     // The long pressing pointer Y if coordinate remapping is needed.
     private int mLongPressingPointerDeltaY;
 
+    // The id of the last touch explored window.
+    private int mLastTouchedWindowId;
+
     /**
      * Creates a new instance.
      *
@@ -305,6 +308,11 @@ public void onAccessibilityEvent(AccessibilityEvent event) {
                     mInjectedPointerTracker.mLastInjectedHoverEvent.recycle();
                     mInjectedPointerTracker.mLastInjectedHoverEvent = null;
                 }
+                mLastTouchedWindowId = -1;
+            } break;
+            case AccessibilityEvent.TYPE_VIEW_HOVER_ENTER:
+            case AccessibilityEvent.TYPE_VIEW_HOVER_EXIT: {
+                mLastTouchedWindowId = event.getWindowId();
             } break;
         }
     }
@@ -1078,13 +1086,15 @@ public void onDoubleTap(MotionEvent secondTapUp, int policyFlags) {
                 clickLocationX = (int) lastExploreEvent.getX(lastExplorePointerIndex);
                 clickLocationY = (int) lastExploreEvent.getY(lastExplorePointerIndex);
                 Rect activeWindowBounds = mTempRect;
-                mAms.getActiveWindowBounds(activeWindowBounds);
-                if (activeWindowBounds.contains(clickLocationX, clickLocationY)) {
-                    Rect focusBounds = mTempRect;
-                    if (mAms.getAccessibilityFocusBoundsInActiveWindow(focusBounds)) {
-                        if (!focusBounds.contains(clickLocationX, clickLocationY)) {
-                            clickLocationX = focusBounds.centerX();
-                            clickLocationY = focusBounds.centerY();
+                if (mLastTouchedWindowId == mAms.getActiveWindowId()) {
+                    mAms.getActiveWindowBounds(activeWindowBounds);
+                    if (activeWindowBounds.contains(clickLocationX, clickLocationY)) {
+                        Rect focusBounds = mTempRect;
+                        if (mAms.getAccessibilityFocusBoundsInActiveWindow(focusBounds)) {
+                            if (!focusBounds.contains(clickLocationX, clickLocationY)) {
+                                clickLocationX = focusBounds.centerX();
+                                clickLocationY = focusBounds.centerY();
+                            }
                         }
                     }
                 }
@@ -1308,13 +1318,15 @@ public void run() {
                 clickLocationX = (int) lastExploreEvent.getX(lastExplorePointerIndex);
                 clickLocationY = (int) lastExploreEvent.getY(lastExplorePointerIndex);
                 Rect activeWindowBounds = mTempRect;
-                mAms.getActiveWindowBounds(activeWindowBounds);
-                if (activeWindowBounds.contains(clickLocationX, clickLocationY)) {
-                    Rect focusBounds = mTempRect;
-                    if (mAms.getAccessibilityFocusBoundsInActiveWindow(focusBounds)) {
-                        if (!focusBounds.contains(clickLocationX, clickLocationY)) {
-                            clickLocationX = focusBounds.centerX();
-                            clickLocationY = focusBounds.centerY();
+                if (mLastTouchedWindowId == mAms.getActiveWindowId()) {
+                    mAms.getActiveWindowBounds(activeWindowBounds);
+                    if (activeWindowBounds.contains(clickLocationX, clickLocationY)) {
+                        Rect focusBounds = mTempRect;
+                        if (mAms.getAccessibilityFocusBoundsInActiveWindow(focusBounds)) {
+                            if (!focusBounds.contains(clickLocationX, clickLocationY)) {
+                                clickLocationX = focusBounds.centerX();
+                                clickLocationY = focusBounds.centerY();
+                            }
                         }
                     }
                 }