summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrei Stingaceanu <stg@google.com> 2015-06-24 11:56:43 +0100
committer Andrei Stingaceanu <stg@google.com> 2015-06-25 11:54:43 +0100
commit1cb1f1523a927bba670f36adea57106a0f61c07c (patch)
tree96b71f615110308d0f0cdf85a1333edc3e0d921e
parent2e5615467e40856e758631cea542da804de01a7d (diff)
EditText - can not drag handles in extracted mode
In TextView's onPreDraw method, startSelectionActionMode() is called, but the selection has already been started so in startSelectionActionMode() it shows the insertionController which hides the selectionController. Fix this by adding a check to start the action mode only if it is not already started. Bug: 22028858 Change-Id: I2999423155b7a63a7d879bc8ea5032e17dff459f
-rw-r--r--core/java/android/widget/TextView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index e84ba9968de7..77e5b10f5464 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5230,7 +5230,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// 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();
}