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

* commit 'afad464c1b73540941e052e33ba6ab318426ff80': Disallow dragging text in extracted mode
2015-07-24 15:00:11 +00:00
parent ff42cce4be afad464c1b
commit 31006d9243
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1004,7 +1004,8 @@ public class Editor {
        }

        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();