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

Commit ba73272b authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Adjusting touch explorer to fix split tap behavior discrepancies" into main

parents 11a36f4a 9e19465f

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

+9 −2
Original line number Diff line number Diff line
@@ -414,8 +414,15 @@ public class TouchExplorer extends BaseEventStreamTransformation 
            mSendTouchExplorationEndDelayed.forceSendAndRemove();

        }



        if (!Flags.pointerUpMotionEventInTouchExploration()) {

            // Announce the end of a new touch interaction.

            mDispatcher.sendAccessibilityEvent(TYPE_TOUCH_INTERACTION_END);

        } else {

            // If there are no pointers left on screen, announce the end of the touch interaction.

            if (mReceivedPointerTracker.getReceivedPointerDownCount() == 0) {

                mDispatcher.sendAccessibilityEvent(TYPE_TOUCH_INTERACTION_END);

            }

        }

        mSendTouchInteractionEndDelayed.cancel();

        // Try to use the standard accessibility API to click

        if (!mAms.performActionOnAccessibilityFocusedItem(

services/tests/servicestests/src/com/android/server/accessibility/gestures/TouchExplorerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ public class TouchExplorerTest { 
    public void upEventWhenInTwoFingerMove_clearsState() {

        goFromStateClearTo(STATE_MOVING_2FINGERS);



        send(pointerUpEvent());

        send(upEvent());

        assertState(STATE_CLEAR);

    }