Merge changes I990693ac,Ibcae2a5a

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

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

@@ -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

@@ -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;
                         }
                     }