Merge "Remove insertion action mode runnable on selection start" into mnc-dev

2015-06-08 16:50:50 +00:00
parent aac4c5c28f 7184c8aaf1
commit 2ea838d539
1 changed files with 3 additions and 4 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1752,11 +1752,10 @@ public class Editor {
     * @return true if the drag was started.
     */
    private boolean selectCurrentWordAndStartDrag() {
+        if (mInsertionActionModeRunnable != null) {
+            mTextView.removeCallbacks(mInsertionActionModeRunnable);
+        }
        if (extractedTextModeWillBeStarted()) {
-            // Cancel the single tap delayed runnable.
-            if (mInsertionActionModeRunnable != null) {
-                mTextView.removeCallbacks(mInsertionActionModeRunnable);
-            }
            return false;
        }
        if (mTextActionMode != null) {