Merge change 2737 into donut (7a8c4377) · Commits · e / os / android_frameworks_base

core/java/android/gesture/GestureOverlayView.java

+55 −45

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public class GestureOverlayView extends FrameLayout {
		private int mInvalidateExtraBorder = 10;

		private int mGestureStrokeType = GESTURE_STROKE_TYPE_SINGLE;
		private float mGestureStrokeLengthThreshold = 30.0f;
		private float mGestureStrokeLengthThreshold = 50.0f;
		private float mGestureStrokeSquarenessTreshold = 0.275f;
		private float mGestureStrokeAngleThreshold = 40.0f;

		@@ -554,7 +554,6 @@ public class GestureOverlayView extends FrameLayout {

		mX = x;
		mY = y;
		}

		mStrokeBuffer.add(new GesturePoint(x, y, event.getEventTime()));

		@@ -587,6 +586,7 @@ public class GestureOverlayView extends FrameLayout {
		for (int i = 0; i < count; i++) {
		listeners.get(i).onGesture(this, event);
		}
		}

		return areaToRefresh;
		}
		@@ -594,9 +594,10 @@ public class GestureOverlayView extends FrameLayout {
		private void touchUp(MotionEvent event, boolean cancel) {
		mIsListeningForGestures = false;

		// A gesture wasn't started or was cancelled
		if (mCurrentGesture != null) {
		// add the stroke to the current gesture
		mCurrentGesture.addStroke(new GestureStroke(mStrokeBuffer));
		mStrokeBuffer.clear();

		if (!cancel) {
		// pass the event to handlers
		@@ -610,6 +611,18 @@ public class GestureOverlayView extends FrameLayout {
		clear(mFadeEnabled, mIsGesturing);
		}
		} else {
		cancelGesture(event);

		}
		} else {
		cancelGesture(event);
		}

		mStrokeBuffer.clear();
		mIsGesturing = false;
		}

		private void cancelGesture(MotionEvent event) {
		// pass the event to handlers
		final ArrayList<OnGestureListener> listeners = mOnGestureListeners;
		final int count = listeners.size();
		@@ -620,9 +633,6 @@ public class GestureOverlayView extends FrameLayout {
		clear(false);
		}

		mIsGesturing = false;
		}

		private void fireOnGesturePerformed() {
		final ArrayList<OnGesturePerformedListener> actionListeners =
		mOnGesturePerformedListeners;

core/java/android/gesture/GestureStroke.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import java.util.ArrayList;
		* A gesture stroke started on a touch down and ended on a touch up.
		*/
		public class GestureStroke {
		static final float TOUCH_TOLERANCE = 3;
		static final float TOUCH_TOLERANCE = 8;

		public final RectF boundingBox;

core/res/res/values/styles.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@
		<item name="android:uncertainGestureColor">#48ffff00</item>
		<item name="android:fadeOffset">420</item>
		<item name="android:fadeDuration">150</item>
		<item name="android:gestureStrokeLengthThreshold">30.0</item>
		<item name="android:gestureStrokeLengthThreshold">50.0</item>
		<item name="android:gestureStrokeSquarenessThreshold">0.275</item>
		<item name="android:gestureStrokeAngleThreshold">40.0</item>
		<item name="android:eventsInterceptionEnabled">true</item>