Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38f60684 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-70560489aa0542c99c9043781a2333f5" into rvc-d1-dev-plus-aosp 

* changes:
  Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3c am: d6744b0a
  [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d am: 63a3ab4e
parents 0d878a3e c71cc8a2

services/accessibility/java/com/android/server/accessibility/gestures/EventDispatcher.java

+6 −0
Original line number Diff line number Diff line
@@ -322,6 +322,12 @@ class EventDispatcher { 
        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);

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

+1 −0
Original line number Diff line number Diff line
@@ -809,6 +809,7 @@ public class TouchExplorer extends BaseEventStreamTransformation 


                // Announce the end of a the touch interaction.

                mAms.onTouchInteractionEnd();

                mDispatcher.clear();

                mDispatcher.sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);



            } break;