Merge "Remove speed requirements for multi-finger swipes" (7e2a4e8c) · Commits · e / os / android_frameworks_base

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

+25 −81

Original line number	Diff line number	Diff line
		@@ -18,11 +18,7 @@ package com.android.server.accessibility.gestures;

		import static android.view.MotionEvent.INVALID_POINTER_ID;

		import static com.android.server.accessibility.gestures.GestureUtils.MM_PER_CM;
		import static com.android.server.accessibility.gestures.GestureUtils.getActionIndex;
		import static com.android.server.accessibility.gestures.Swipe.GESTURE_CONFIRM_CM;
		import static com.android.server.accessibility.gestures.Swipe.MAX_TIME_TO_CONTINUE_SWIPE_MS;
		import static com.android.server.accessibility.gestures.Swipe.MAX_TIME_TO_START_SWIPE_MS;
		import static com.android.server.accessibility.gestures.TouchExplorer.DEBUG;

		import android.content.Context;
		@@ -30,7 +26,6 @@ import android.graphics.PointF;
		import android.os.Handler;
		import android.util.DisplayMetrics;
		import android.util.Slog;
		import android.util.TypedValue;
		import android.view.MotionEvent;
		import android.view.ViewConfiguration;

		@@ -49,9 +44,6 @@ class MultiFingerSwipe extends GestureMatcher {
		public static final int RIGHT = 1;
		public static final int UP = 2;
		public static final int DOWN = 3;
		// This is the calculated movement threshold used track if the user is still
		// moving their finger.
		private final float mGestureDetectionThresholdPixels;

		// Buffer for storing points for gesture detection.
		private final ArrayList<PointF>[] mStrokeBuffers;
		@@ -93,10 +85,7 @@ class MultiFingerSwipe extends GestureMatcher {
		mStrokeBuffers = new ArrayList[mTargetFingerCount];
		mDirection = direction;
		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
		mGestureDetectionThresholdPixels =
		TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, MM_PER_CM, displayMetrics)
		* GESTURE_CONFIRM_CM;
		// Calculate minimum gesture velocity
		// Calculate gesture sampling interval.
		final float pixelsPerCmX = displayMetrics.xdpi / GestureUtils.CM_PER_INCH;
		final float pixelsPerCmY = displayMetrics.ydpi / GestureUtils.CM_PER_INCH;
		mMinPixelsBetweenSamplesX = MIN_CM_BETWEEN_SAMPLES * pixelsPerCmX;
		@@ -150,7 +139,6 @@ class MultiFingerSwipe extends GestureMatcher {
		return;
		}
		mPointerIds[pointerIndex] = pointerId;
		cancelAfterPauseThreshold(event, rawEvent, policyFlags);
		if (Float.isNaN(mBase[pointerIndex].x) && Float.isNaN(mBase[pointerIndex].y)) {
		final float x = rawEvent.getX(actionIndex);
		final float y = rawEvent.getY(actionIndex);
		@@ -197,7 +185,6 @@ class MultiFingerSwipe extends GestureMatcher {
		return;
		}
		mPointerIds[pointerIndex] = pointerId;
		cancelAfterPauseThreshold(event, rawEvent, policyFlags);
		if (Float.isNaN(mBase[pointerIndex].x) && Float.isNaN(mBase[pointerIndex].y)) {
		final float x = rawEvent.getX(actionIndex);
		final float y = rawEvent.getY(actionIndex);
		@@ -286,65 +273,42 @@ class MultiFingerSwipe extends GestureMatcher {
		Math.abs(x - mBase[pointerIndex].x),
		Math.abs(y - mBase[pointerIndex].y));
		if (DEBUG) {
		Slog.d(
		getGestureName(),
		"moveDelta:"
		+ Double.toString(moveDelta)
		+ " mGestureDetectionThreshold: "
		+ Float.toString(mGestureDetectionThresholdPixels));
		Slog.d(getGestureName(), "moveDelta:" + moveDelta);
		}
		if (getState() == STATE_CLEAR) {
		if (moveDelta < (mTargetFingerCount * mTouchSlop)) {
		// This still counts as a touch not a swipe.
		continue;
		} else if (mStrokeBuffers[pointerIndex].size() == 0) {
		}
		// First, make sure we have the right number of fingers down.
		if (mCurrentFingerCount != mTargetFingerCount) {
		cancelGesture(event, rawEvent, policyFlags);
		return;
		}
		// Then, make sure the pointer is going in the right direction.
		int direction =
		toDirection(x - mBase[pointerIndex].x, y - mBase[pointerIndex].y);
		int direction = toDirection(x - mBase[pointerIndex].x, y - mBase[pointerIndex].y);
		if (direction != mDirection) {
		cancelGesture(event, rawEvent, policyFlags);
		return;
		} else {
		}
		// This is confirmed to be some kind of swipe so start tracking points.
		cancelAfterPauseThreshold(event, rawEvent, policyFlags);
		startGesture(event, rawEvent, policyFlags);
		for (int i = 0; i < mTargetFingerCount; ++i) {
		mStrokeBuffers[i].add(new PointF(mBase[i]));
		}
		}
		}
		if (moveDelta > mGestureDetectionThresholdPixels) {
		// Try to cancel if the finger starts to go the wrong way.
		} else if (getState() == STATE_GESTURE_STARTED) {
		// Cancel if the finger starts to go the wrong way.
		// Note that this only works because this matcher assumes one direction.
		int direction =
		toDirection(x - mBase[pointerIndex].x, y - mBase[pointerIndex].y);
		int direction = toDirection(x - mBase[pointerIndex].x, y - mBase[pointerIndex].y);
		if (direction != mDirection) {
		cancelGesture(event, rawEvent, policyFlags);
		return;
		}
		// If the pointer has moved more than the threshold,
		// update the stored values.
		mBase[pointerIndex].x = x;
		mBase[pointerIndex].y = y;
		mPreviousGesturePoint[pointerIndex].x = x;
		mPreviousGesturePoint[pointerIndex].y = y;
		if (getState() == STATE_CLEAR) {
		startGesture(event, rawEvent, policyFlags);
		cancelAfterPauseThreshold(event, rawEvent, policyFlags);
		}
		}
		}
		if (getState() == STATE_GESTURE_STARTED) {
		if (dX >= mMinPixelsBetweenSamplesX \|\| dY >= mMinPixelsBetweenSamplesY) {
		// Sample every 2.5 MM in order to guard against minor variations in path.
		mPreviousGesturePoint[pointerIndex].x = x;
		mPreviousGesturePoint[pointerIndex].y = y;
		mStrokeBuffers[pointerIndex].add(new PointF(x, y));
		cancelAfterPauseThreshold(event, rawEvent, policyFlags);
		}
		}
		}
		@@ -378,24 +342,6 @@ class MultiFingerSwipe extends GestureMatcher {
		recognizeGesture(event, rawEvent, policyFlags);
		}

		/**
		* queues a transition to STATE_GESTURE_CANCEL based on the current state. If we have
		* transitioned to STATE_GESTURE_STARTED the delay is longer.
		*/
		private void cancelAfterPauseThreshold(
		MotionEvent event, MotionEvent rawEvent, int policyFlags) {
		cancelPendingTransitions();
		switch (getState()) {
		case STATE_CLEAR:
		cancelAfter(MAX_TIME_TO_START_SWIPE_MS, event, rawEvent, policyFlags);
		break;
		case STATE_GESTURE_STARTED:
		cancelAfter(MAX_TIME_TO_CONTINUE_SWIPE_MS, event, rawEvent, policyFlags);
		break;
		default:
		break;
		}
		}
		/**
		* Looks at the sequence of motions in mStrokeBuffer, classifies the gesture, then transitions
		* to the complete or cancel state depending on the result.
		@@ -502,8 +448,6 @@ class MultiFingerSwipe extends GestureMatcher {
		if (getState() != STATE_GESTURE_CANCELED) {
		builder.append(", mBase: ")
		.append(mBase.toString())
		.append(", mGestureDetectionThreshold:")
		.append(mGestureDetectionThresholdPixels)
		.append(", mMinPixelsBetweenSamplesX:")
		.append(mMinPixelsBetweenSamplesX)
		.append(", mMinPixelsBetweenSamplesY:")