resolved conflicts for merge of 955e8d79 to master (371790b7) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+9 −14

Original line number	Diff line number	Diff line
		@@ -9318,7 +9318,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		private static final int RECENT_CUT_COPY_DURATION = 15 * 1000; // seconds

		// Used to detect taps on the insertion handle, which will affect the PastePopupWindow
		private long mTouchTimer;
		private float mDownPositionX, mDownPositionY;
		private PastePopupWindow mPastePopupWindow;
		private Runnable mHider;
		@@ -9392,12 +9391,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		case MotionEvent.ACTION_DOWN:
		mDownPositionX = ev.getRawX();
		mDownPositionY = ev.getRawY();
		mTouchTimer = SystemClock.uptimeMillis();
		break;

		case MotionEvent.ACTION_UP:
		long delay = SystemClock.uptimeMillis() - mTouchTimer;
		if (delay < ViewConfiguration.getTapTimeout()) {
		final float deltaX = mDownPositionX - ev.getRawX();
		final float deltaY = mDownPositionY - ev.getRawY();
		final float distanceSquared = deltaX * deltaX + deltaY * deltaY;
		@@ -9409,7 +9405,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		show(0);
		}
		}
		}
		hideDelayed();
		break;