Merge "Dismiss magnifier correctly in concurrent editing scenario" into sc-dev (7b0989f3) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -6684,13 +6684,13 @@ public class Editor {
		if (TextView.DEBUG_CURSOR) {
		logCursor("SelectionModifierCursorController: onTouchEvent", "ACTION_UP");
		}
		if (mEndHandle != null) {
		mEndHandle.dismissMagnifier();
		}
		if (!isDragAcceleratorActive()) {
		break;
		}
		updateSelection(event);
		if (mEndHandle != null) {
		mEndHandle.dismissMagnifier();
		}

		// No longer dragging to select text, let the parent intercept events.
		mTextView.getParent().requestDisallowInterceptTouchEvent(false);