summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClara Bayarri <clarabayarri@google.com>2015-06-08 16:50:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-08 16:51:00 +0000
commit2ea838d539ec13215554e40303a757ea4a1f3d39 (patch)
tree6f09e2b288e65657424b539cc36fdb958fb15e13
parentaac4c5c28f6699ddcbbc25638e73e5ab42b8360e (diff)
parent7184c8aaf1c1bae4f6b1e31125342c6d023e1ec5 (diff)
downloadframeworks_base-2ea838d539ec13215554e40303a757ea4a1f3d39.zip
frameworks_base-2ea838d539ec13215554e40303a757ea4a1f3d39.tar.gz
frameworks_base-2ea838d539ec13215554e40303a757ea4a1f3d39.tar.bz2
Merge "Remove insertion action mode runnable on selection start" into mnc-dev
-rw-r--r--core/java/android/widget/Editor.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index e175949..cd110b7 100644
--- 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) {