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

Commit aa432540 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag "send_hover_events_based_on_event..."" into main

parents 2e342c39 c73526a9

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

+3 −11
Original line number Original line Diff line number Diff line
@@ -240,10 +240,7 @@ public class TouchExplorer extends BaseEventStreamTransformation 
    }

    }





    private void clear(MotionEvent event, int policyFlags) {

    private void clear(MotionEvent event, int policyFlags) {

        if (mState.isTouchExploring() || Flags.sendHoverEventsBasedOnEventStream()) {

            // If a touch exploration gesture is in progress send events for its end.

        sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);

        sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);

        }

        mDraggingPointerId = INVALID_POINTER_ID;

        mDraggingPointerId = INVALID_POINTER_ID;

        // Send exit to any pointers that we have delivered as part of delegating or dragging.

        // Send exit to any pointers that we have delivered as part of delegating or dragging.

        mDispatcher.sendUpForInjectedDownPointers(event, policyFlags);

        mDispatcher.sendUpForInjectedDownPointers(event, policyFlags);
@@ -562,10 +559,7 @@ public class TouchExplorer extends BaseEventStreamTransformation 
        // clear any hover events that might have been queued and never sent.

        // clear any hover events that might have been queued and never sent.

        mSendHoverEnterAndMoveDelayed.clear();

        mSendHoverEnterAndMoveDelayed.clear();

        mSendHoverExitDelayed.cancel();

        mSendHoverExitDelayed.cancel();

        // If a touch exploration gesture is in progress send events for its end.

        if (mState.isTouchExploring() || Flags.sendHoverEventsBasedOnEventStream()) {

        sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);

        sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);

        }

        if (mState.isClear()) {

        if (mState.isClear()) {

            if (!mSendHoverEnterAndMoveDelayed.isPending()) {

            if (!mSendHoverEnterAndMoveDelayed.isPending()) {

                // Queue a delayed transition to STATE_TOUCH_EXPLORING.

                // Queue a delayed transition to STATE_TOUCH_EXPLORING.
@@ -1599,9 +1593,7 @@ public class TouchExplorer extends BaseEventStreamTransformation 
            if (mEvents.size() == 0) {

            if (mEvents.size() == 0) {

                return;

                return;

            }

            }

            if (Flags.sendHoverEventsBasedOnEventStream()) {

            sendHoverExitAndTouchExplorationGestureEndIfNeeded(mPolicyFlags);

            sendHoverExitAndTouchExplorationGestureEndIfNeeded(mPolicyFlags);

            }

            // Send an accessibility event to announce the touch exploration start.

            // Send an accessibility event to announce the touch exploration start.

            mDispatcher.sendAccessibilityEvent(TYPE_TOUCH_EXPLORATION_GESTURE_START);

            mDispatcher.sendAccessibilityEvent(TYPE_TOUCH_EXPLORATION_GESTURE_START);

            if (isSendMotionEventsEnabled()) {

            if (isSendMotionEventsEnabled()) {