Merge "A tap on the insertion handle is only handled if it has not been moved" (eba69ac0) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+15 −9

Original line number	Diff line number	Diff line
		@@ -9807,6 +9807,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}

		public boolean offsetHasBeenChanged() {
		return mNumberPreviousOffsets > 1;
		}

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		setMeasuredDimension(mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight());
		@@ -10076,6 +10080,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		break;

		case MotionEvent.ACTION_UP:
		if (!offsetHasBeenChanged()) {
		final float deltaX = mDownPositionX - ev.getRawX();
		final float deltaY = mDownPositionY - ev.getRawY();
		final float distanceSquared = deltaX * deltaX + deltaY * deltaY;
		@@ -10087,6 +10092,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		show(0);
		}
		}
		}
		hideAfterDelay();
		break;