Merge "Fix service touch exploration." into tm-dev

This commit is contained in:
Ameer Armaly
2022-03-07 17:08:38 +00:00
committed by Android (Google) Code Review

View File

@@ -1327,14 +1327,13 @@ public class TouchExplorer extends BaseEventStreamTransformation
if (mState.isServiceDetectingGestures() && mState.isTouchInteracting()) { if (mState.isServiceDetectingGestures() && mState.isTouchInteracting()) {
// Cancel without deleting events. // Cancel without deleting events.
mHandler.removeCallbacks(mSendHoverEnterAndMoveDelayed); mHandler.removeCallbacks(mSendHoverEnterAndMoveDelayed);
mSendHoverEnterAndMoveDelayed.run();
mSendHoverEnterAndMoveDelayed.clear();
final MotionEvent prototype = mState.getLastReceivedEvent();
final MotionEvent rawEvent = mState.getLastReceivedRawEvent();
final int pointerId = mReceivedPointerTracker.getPrimaryPointerId(); final int pointerId = mReceivedPointerTracker.getPrimaryPointerId();
final int pointerIdBits = (1 << pointerId); final int pointerIdBits = (1 << pointerId);
final int policyFlags = mState.getLastReceivedPolicyFlags(); final int policyFlags = mState.getLastReceivedPolicyFlags();
mSendHoverExitDelayed.post(prototype, rawEvent, pointerIdBits, policyFlags); mSendHoverEnterAndMoveDelayed.setPointerIdBits(pointerIdBits);
mSendHoverEnterAndMoveDelayed.setPolicyFlags(policyFlags);
mSendHoverEnterAndMoveDelayed.run();
mSendHoverEnterAndMoveDelayed.clear();
} }
} }