Merge "Ignore smart selection for multi-word selections." (8e332cc5) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -1984,12 +1984,12 @@ public class Editor {
		if (mRestartActionModeOnNextRefresh) {
		// To avoid distraction, newly start action mode only when selection action
		// mode is being restarted.
		startSelectionActionMode(getTextClassifierInfo(true));
		startSelectionActionMode(null);
		}
		} else if (selectionController == null \|\| !selectionController.isActive()) {
		// Insertion action mode is active. Avoid dismissing the selection.
		stopTextActionModeWithPreservingSelection();
		startSelectionActionMode(getTextClassifierInfo(true));
		startSelectionActionMode(null);
		} else {
		mTextActionMode.invalidateContentRect();
		}
		@@ -5496,8 +5496,9 @@ public class Editor {
		resetDragAcceleratorState();

		if (mTextView.hasSelection()) {
		// TODO: Do not invoke the text assistant if this was a drag selection.
		startSelectionActionMode(getTextClassifierInfo(true));
		// Do not invoke the text assistant if this was a drag selection.
		startSelectionActionMode(
		mHaventMovedEnoughToStartDrag ? getTextClassifierInfo(true) : null);
		}
		break;
		}