Merge cherrypicks of [6796135] into qt-release (2098f676) · Commits · e / os / android_frameworks_base

core/java/android/view/GestureDetector.java

+5 −68

Original line number	Diff line number	Diff line
		@@ -16,20 +16,11 @@

		package android.view;

		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DOUBLE_TAP;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SCROLL;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION;

		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.Build;
		import android.os.Handler;
		import android.os.Message;
		import android.os.SystemClock;
		import android.util.StatsLog;

		/**
		* Detects various gestures and events using the supplied {@link MotionEvent}s.
		@@ -260,12 +251,8 @@ public class GestureDetector {
		private boolean mAlwaysInTapRegion;
		private boolean mAlwaysInBiggerTapRegion;
		private boolean mIgnoreNextUpEvent;
		// Whether a classification has been recorded by statsd for the current event stream. Reset on
		// ACTION_DOWN.
		private boolean mHasRecordedClassification;

		private MotionEvent mCurrentDownEvent;
		private MotionEvent mCurrentMotionEvent;
		private MotionEvent mPreviousUpEvent;

		/**
		@@ -310,7 +297,6 @@ public class GestureDetector {
		break;

		case LONG_PRESS:
		recordGestureClassification(msg.arg1);
		dispatchLongPress();
		break;

		@@ -318,8 +304,6 @@ public class GestureDetector {
		// If the user's finger is still down, do not count it as a tap
		if (mDoubleTapListener != null) {
		if (!mStillDown) {
		recordGestureClassification(
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP);
		mDoubleTapListener.onSingleTapConfirmed(mCurrentDownEvent);
		} else {
		mDeferConfirmSingleTap = true;
		@@ -517,11 +501,6 @@ public class GestureDetector {

		final int action = ev.getAction();

		if (mCurrentMotionEvent != null) {
		mCurrentMotionEvent.recycle();
		}
		mCurrentMotionEvent = MotionEvent.obtain(ev);

		if (mVelocityTracker == null) {
		mVelocityTracker = VelocityTracker.obtain();
		}
		@@ -590,8 +569,6 @@ public class GestureDetector {
		&& isConsideredDoubleTap(mCurrentDownEvent, mPreviousUpEvent, ev)) {
		// This is a second tap
		mIsDoubleTapping = true;
		recordGestureClassification(
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DOUBLE_TAP);
		// Give a callback with the first tap of the double-tap
		handled \|= mDoubleTapListener.onDoubleTap(mCurrentDownEvent);
		// Give a callback with down event of the double-tap
		@@ -613,16 +590,10 @@ public class GestureDetector {
		mStillDown = true;
		mInLongPress = false;
		mDeferConfirmSingleTap = false;
		mHasRecordedClassification = false;

		if (mIsLongpressEnabled) {
		mHandler.removeMessages(LONG_PRESS);
		mHandler.sendMessageAtTime(
		mHandler.obtainMessage(
		LONG_PRESS,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS,
		0 /* arg2 */),
		mCurrentDownEvent.getDownTime()
		mHandler.sendEmptyMessageAtTime(LONG_PRESS, mCurrentDownEvent.getDownTime()
		+ ViewConfiguration.getLongPressTimeout());
		}
		mHandler.sendEmptyMessageAtTime(SHOW_PRESS,
		@@ -642,8 +613,6 @@ public class GestureDetector {
		final float scrollY = mLastFocusY - focusY;
		if (mIsDoubleTapping) {
		// Give the move events of the double-tap
		recordGestureClassification(
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DOUBLE_TAP);
		handled \|= mDoubleTapListener.onDoubleTapEvent(ev);
		} else if (mAlwaysInTapRegion) {
		final int deltaX = (int) (focusX - mDownFocusX);
		@@ -666,12 +635,8 @@ public class GestureDetector {
		// reschedule long press with a modified timeout.
		mHandler.removeMessages(LONG_PRESS);
		final long longPressTimeout = ViewConfiguration.getLongPressTimeout();
		mHandler.sendMessageAtTime(
		mHandler.obtainMessage(
		LONG_PRESS,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS,
		0 /* arg2 */),
		ev.getDownTime() + (long) (longPressTimeout * multiplier));
		mHandler.sendEmptyMessageAtTime(LONG_PRESS, ev.getDownTime()
		+ (long) (longPressTimeout * multiplier));
		}
		// Inhibit default scroll. If a gesture is ambiguous, we prevent scroll
		// until the gesture is resolved.
		@@ -681,8 +646,6 @@ public class GestureDetector {
		}

		if (distance > slopSquare) {
		recordGestureClassification(
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SCROLL);
		handled = mListener.onScroll(mCurrentDownEvent, ev, scrollX, scrollY);
		mLastFocusX = focusX;
		mLastFocusY = focusY;
		@@ -696,7 +659,6 @@ public class GestureDetector {
		mAlwaysInBiggerTapRegion = false;
		}
		} else if ((Math.abs(scrollX) >= 1) \|\| (Math.abs(scrollY) >= 1)) {
		recordGestureClassification(TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SCROLL);
		handled = mListener.onScroll(mCurrentDownEvent, ev, scrollX, scrollY);
		mLastFocusX = focusX;
		mLastFocusY = focusY;
		@@ -705,11 +667,7 @@ public class GestureDetector {
		motionClassification == MotionEvent.CLASSIFICATION_DEEP_PRESS;
		if (deepPress && hasPendingLongPress) {
		mHandler.removeMessages(LONG_PRESS);
		mHandler.sendMessage(
		mHandler.obtainMessage(
		LONG_PRESS,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS,
		0 /* arg2 */));
		mHandler.sendEmptyMessage(LONG_PRESS);
		}
		break;

		@@ -718,15 +676,11 @@ public class GestureDetector {
		MotionEvent currentUpEvent = MotionEvent.obtain(ev);
		if (mIsDoubleTapping) {
		// Finally, give the up event of the double-tap
		recordGestureClassification(
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DOUBLE_TAP);
		handled \|= mDoubleTapListener.onDoubleTapEvent(ev);
		} else if (mInLongPress) {
		mHandler.removeMessages(TAP);
		mInLongPress = false;
		} else if (mAlwaysInTapRegion && !mIgnoreNextUpEvent) {
		recordGestureClassification(
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP);
		handled = mListener.onSingleTapUp(ev);
		if (mDeferConfirmSingleTap && mDoubleTapListener != null) {
		mDoubleTapListener.onSingleTapConfirmed(ev);
		@@ -867,21 +821,4 @@ public class GestureDetector {
		mInLongPress = true;
		mListener.onLongPress(mCurrentDownEvent);
		}

		private void recordGestureClassification(int classification) {
		if (mHasRecordedClassification
		\|\| classification
		== TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION) {
		// Only record the first classification for an event stream.
		return;
		}
		StatsLog.write(
		StatsLog.TOUCH_GESTURE_CLASSIFIED,
		getClass().getName(),
		classification,
		(int) (SystemClock.uptimeMillis() - mCurrentMotionEvent.getDownTime()),
		(float) Math.hypot(mCurrentMotionEvent.getRawX() - mCurrentDownEvent.getRawX(),
		mCurrentMotionEvent.getRawY() - mCurrentDownEvent.getRawY()));
		mHasRecordedClassification = true;
		}
		}

core/java/android/view/View.java

+7 −55

Original line number	Diff line number	Diff line
		@@ -17,10 +17,6 @@
		package android.view;

		import static android.content.res.Resources.ID_NULL;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP;
		import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION;
		import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL;
		import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED;

		@@ -100,7 +96,6 @@ import android.util.Property;
		import android.util.SparseArray;
		import android.util.SparseIntArray;
		import android.util.StateSet;
		import android.util.StatsLog;
		import android.util.SuperNotCalledException;
		import android.util.TypedValue;
		import android.view.AccessibilityIterators.CharacterTextSegmentIterator;
		@@ -14546,12 +14541,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (clickable) {
		setPressed(true, x, y);
		}
		checkForLongClick(
		ViewConfiguration.getLongPressTimeout(),
		x,
		y,
		// This is not a touch gesture -- do not classify it as one.
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION);
		checkForLongClick(ViewConfiguration.getLongPressTimeout(), x, y);
		return true;
		}
		}
		@@ -15292,11 +15282,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		mHasPerformedLongPress = false;

		if (!clickable) {
		checkForLongClick(
		ViewConfiguration.getLongPressTimeout(),
		x,
		y,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS);
		checkForLongClick(ViewConfiguration.getLongPressTimeout(), x, y);
		break;
		}

		@@ -15320,11 +15306,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		} else {
		// Not inside a scrolling container, so show the feedback right away
		setPressed(true, x, y);
		checkForLongClick(
		ViewConfiguration.getLongPressTimeout(),
		x,
		y,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS);
		checkForLongClick(ViewConfiguration.getLongPressTimeout(), x, y);
		}
		break;

		@@ -15361,11 +15343,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* ambiguousMultiplier);
		// Subtract the time already spent
		delay -= event.getEventTime() - event.getDownTime();
		checkForLongClick(
		delay,
		x,
		y,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS);
		checkForLongClick(delay, x, y);
		}
		touchSlop *= ambiguousMultiplier;
		}
		@@ -15387,11 +15365,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (deepPress && hasPendingLongPressCallback()) {
		// process the long click action immediately
		removeLongPressCallback();
		checkForLongClick(
		0 /* send immediately */,
		x,
		y,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS);
		checkForLongClick(0 /* send immediately */, x, y);
		}

		break;
		@@ -26056,7 +26030,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}

		private void checkForLongClick(long delay, float x, float y, int classification) {
		private void checkForLongClick(long delay, float x, float y) {
		if ((mViewFlags & LONG_CLICKABLE) == LONG_CLICKABLE \|\| (mViewFlags & TOOLTIP) == TOOLTIP) {
		mHasPerformedLongPress = false;

		@@ -26066,7 +26040,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		mPendingCheckForLongPress.setAnchor(x, y);
		mPendingCheckForLongPress.rememberWindowAttachCount();
		mPendingCheckForLongPress.rememberPressedState();
		mPendingCheckForLongPress.setClassification(classification);
		postDelayed(mPendingCheckForLongPress, delay);
		}
		}
		@@ -27624,17 +27597,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		private float mX;
		private float mY;
		private boolean mOriginalPressedState;
		/**
		* The classification of the long click being checked: one of the
		* StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__* constants.
		*/
		private int mClassification;

		@Override
		public void run() {
		if ((mOriginalPressedState == isPressed()) && (mParent != null)
		&& mOriginalWindowAttachCount == mWindowAttachCount) {
		recordGestureClassification(mClassification);
		if (performLongClick(mX, mY)) {
		mHasPerformedLongPress = true;
		}
		@@ -27653,10 +27620,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		public void rememberPressedState() {
		mOriginalPressedState = isPressed();
		}

		public void setClassification(int classification) {
		mClassification = classification;
		}
		}

		private final class CheckForTap implements Runnable {
		@@ -27669,28 +27632,17 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		setPressed(true, x, y);
		final long delay =
		ViewConfiguration.getLongPressTimeout() - ViewConfiguration.getTapTimeout();
		checkForLongClick(delay, x, y, TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS);
		checkForLongClick(delay, x, y);
		}
		}

		private final class PerformClick implements Runnable {
		@Override
		public void run() {
		recordGestureClassification(TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP);
		performClickInternal();
		}
		}

		/** Records a classification for the current event stream. */
		private void recordGestureClassification(int classification) {
		if (classification == TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION) {
		return;
		}
		// To avoid negatively impacting View performance, the latency and displacement metrics
		// are omitted.
		StatsLog.write(StatsLog.TOUCH_GESTURE_CLASSIFIED, getClass().getName(), classification);
		}

		/**
		* This method returns a ViewPropertyAnimator object, which can be used to animate
		* specific properties on this View.