Merge "Disallow dragging text in extracted mode" into mnc-dev

2015-07-24 14:35:48 +00:00
parent ea00f320ee b50045a519
commit 4579491003
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();