commit f8480f52507e0504a4f05763ffdaf668a067584e
author Andrei Stingaceanu <stg@google.com> Fri Jul 24 16:07:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 24 16:07:41 2015 +0000
tree ca89a536c996b7e738e378e43e11bfe777163fc8
parent f6a39adb1d5701693176adea4d75a61047f77fbb
parent 2029534162b308c7dcb3ef73616ecd6c98b22c64

am 20295341: am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev

* commit '2029534162b308c7dcb3ef73616ecd6c98b22c64':
  Disallow dragging text in extracted mode

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 15d13ae..e169ceb 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1004,7 +1004,8 @@
         }
 
         if (!handled && mTextActionMode != null) {
-            if (touchPositionIsInSelection()) {
+            // TODO: Fix dragging in extracted mode.
+            if (touchPositionIsInSelection() && !mTextView.isInExtractedMode()) {
                 // Start a drag
                 final int start = mTextView.getSelectionStart();
                 final int end = mTextView.getSelectionEnd();