Handle tap and move cursor before showing suggestions

Otherwise the suggestions do not correspond to the tapped location.

Change-Id: Id0bd87931e73513ca7e50c6212a17b0fc7d6179d

1 files changed, 3 insertions, 3 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 9fb26ae7455d..946eb7610251 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8396,6 +8396,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();
@@ -8412,9 +8415,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();
                         }
                     }