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

Commit 8a736d37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I990693ac,Ibcae2a5a 

* changes:
  MultiFingerSwipe: scale touch slop to number of fingers.
  Use correct touch slop value for two-finger passthrough.
parents 89fbbfad 0d110b23

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

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ class MultiFingerSwipe extends GestureMatcher { 
                                + Float.toString(mGestureDetectionThresholdPixels));

            }

            if (getState() == STATE_CLEAR) {

                if (moveDelta < mTouchSlop) {

                if (moveDelta < (mTargetFingerCount * mTouchSlop)) {

                    // This still counts as a touch not a swipe.

                    continue;

                } else if (mStrokeBuffers[pointerIndex].size() == 0) {

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

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ public class TouchExplorer extends BaseEventStreamTransformation 
                                mReceivedPointerTracker.getReceivedPointerDownY(id)

                                        - rawEvent.getY(index);

                        final double moveDelta = Math.hypot(deltaX, deltaY);

                        if (moveDelta < mTouchSlop) {

                        if (moveDelta < (2 * mTouchSlop)) {

                            return;

                        }

                    }