diff options
| -rw-r--r-- | core/java/android/widget/Editor.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index d558c7bc7725..f5a99d1bf208 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -1699,6 +1699,15 @@ public class Editor { * @return true if the selection mode was actually started. */ private boolean startSelectionActionModeWithoutSelection() { + if (extractedTextModeWillBeStarted()) { + // Cancel the single tap delayed runnable. + if (mSelectionModeWithoutSelectionRunnable != null) { + mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable); + } + + return false; + } + if (mSelectionActionMode != null) { // Selection action mode is already started // TODO: revisit invocations to minimize this case. @@ -1740,6 +1749,15 @@ public class Editor { } private boolean startSelectionActionModeWithSelectionInternal() { + if (extractedTextModeWillBeStarted()) { + // Cancel the single tap delayed runnable. + if (mSelectionModeWithoutSelectionRunnable != null) { + mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable); + } + + return false; + } + if (mSelectionActionMode != null) { // Selection action mode is already started mSelectionActionMode.invalidate(); |