Merge "Handle tap and move cursor before showing suggestions" (ea118122) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -8402,6 +8402,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		boolean selectAllGotFocus = mSelectAllOnFocus && didTouchFocusSelect();
		hideControllers();
		if (!selectAllGotFocus && mText.length() > 0) {
		// Move cursor
		final int offset = getOffsetForPosition(event.getX(), event.getY());
		Selection.setSelection((Spannable) mText, offset);
		if (mSpellChecker != null) {
		// When the cursor moves, the word that was typed may need spell check
		mSpellChecker.onSelectionChanged();
		@@ -8418,9 +8421,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		postDelayed(mShowSuggestionRunnable,
		ViewConfiguration.getDoubleTapTimeout());
		} else if (hasInsertionController()) {
		// Move cursor
		final int offset = getOffsetForPosition(event.getX(), event.getY());
		Selection.setSelection((Spannable) mText, offset);
		getInsertionController().show();
		}
		}