commit a54b9641cd832a4bbe6a3e8d0e4cb77449c92a76
author Gilles Debunne <debunne@google.com> Tue Jan 24 10:42:09 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 24 10:42:09 2012 -0800
tree 6f57ac241afc4d45db5dbfbac594bf02711c760c
parent adbbf7a791599cf13494525f7a1359b0cc2dd2f9
parent 4bb2833fa62d57d62a78d662bf937b19dde31ba7

Merge "Restored selectAllOnFocus"

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 04f4a83..9fb26ae 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8386,10 +8386,6 @@
             }
 
             if (touchIsFinished && (isTextEditable() || mTextIsSelectable)) {
-                // Move cursor
-                final int offset = getOffsetForPosition(event.getX(), event.getY());
-                Selection.setSelection((Spannable) mText, offset);
-
                 // Show the IME, except when selecting in read-only text.
                 final InputMethodManager imm = InputMethodManager.peekInstance();
                 viewClicked(imm);
@@ -8416,6 +8412,9 @@
                             postDelayed(mShowSuggestionRunnable,
                                     ViewConfiguration.getDoubleTapTimeout());
                         } else if (hasInsertionController()) {
+                            // Move cursor
+                            final int offset = getOffsetForPosition(event.getX(), event.getY());
+                            Selection.setSelection((Spannable) mText, offset);
                             getInsertionController().show();
                         }
                     }