[DO NOT MERGE] Clear properties after interaction is ended

The properties populated when double-tap and hold is detected is not cleared after interaction end. It cuases an offset on hoverevent. Bug: 160463594 Test: atest TouchExplorerTest Change-Id: Id5115fe64e4bda9c7657f67bef62290858442de9
framework-res · Jul 8, 2020 · 1145db5 · 1145db5
1 parent 76cfda5
commit 1145db5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/EventDispatcher.java b/services/accessibility/java/com/android/server/accessibility/gestures/EventDispatcher.java
@@ -322,6 +322,12 @@ public boolean longPressWithTouchEvents(MotionEvent event, int policyFlags) {
         return true;
     }
 
+    void clear() {
+        mLongPressingPointerId = -1;
+        mLongPressingPointerDeltaX = 0;
+        mLongPressingPointerDeltaY = 0;
+    }
+
     public void clickWithTouchEvents(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
         final int pointerIndex = event.getActionIndex();
         final int pointerId = event.getPointerId(pointerIndex);

diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
@@ -809,6 +809,7 @@ private void handleMotionEventStateDelegating(
 
                 // Announce the end of a the touch interaction.
                 mAms.onTouchInteractionEnd();
+                mDispatcher.clear();
                 mDispatcher.sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);
 
             } break;