commit 3d7109a1f6be56417367ecfdfb2a77c7fe4de3a9
author Andrei Stingaceanu <stg@google.com> Thu Jun 25 15:52:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 15:52:51 2015 +0000
tree 80d0d72ce7d335c30ce9145d75639dc3b3c5aef4
parent f1900b500f71c372376b5d951d581afcca8d7b57
parent 1cb1f1523a927bba670f36adea57106a0f61c07c

Merge "EditText - can not drag handles in extracted mode" into mnc-dev

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index e84ba99..77e5b10 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5230,7 +5230,8 @@
         // Phone specific code (there is no ExtractEditText on tablets).
         // ExtractEditText does not call onFocus when it is displayed, and mHasSelectionOnFocus can
         // not be set. Do the test here instead.
-        if (this instanceof ExtractEditText && hasSelection() && mEditor != null) {
+        if (isInExtractedMode() && hasSelection() && mEditor != null
+                && mEditor.mTextActionMode == null) {
             mEditor.startSelectionActionMode();
         }