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

Commit 2afe1f8d authored by Ameer Armaly's avatar Ameer Armaly Committed by Android (Google) Code Review
Browse files

Merge "Send the correct pointer id when transitioning from dragging to delegating state." into main

parents 5e8abfe7 a1b51f89

services/accessibility/accessibility.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,13 @@ flag { 
    bug: "257274411"

}



flag {

    name: "fix_drag_pointer_when_ending_drag"

    namespace: "accessibility"

    description: "Send the correct pointer id when transitioning from dragging to delegating states."

    bug: "300002193"

}



flag {

    name: "pinch_zoom_zero_min_span"

    namespace: "accessibility"

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

+5 −2
Original line number Diff line number Diff line
@@ -1466,8 +1466,11 @@ public class TouchExplorer extends BaseEventStreamTransformation 
            int policyFlags = mState.getLastReceivedPolicyFlags();

            if (mState.isDragging()) {

                // Send an event to the end of the drag gesture.

                mDispatcher.sendMotionEvent(

                        event, ACTION_UP, rawEvent, ALL_POINTER_ID_BITS, policyFlags);

                int pointerIdBits = ALL_POINTER_ID_BITS;

                if (Flags.fixDragPointerWhenEndingDrag()) {

                    pointerIdBits = 1 << mDraggingPointerId;

                }

                mDispatcher.sendMotionEvent(event, ACTION_UP, rawEvent, pointerIdBits, policyFlags);

            }

            mState.startDelegating();

            // Deliver all pointers to the view hierarchy.