Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index e0796e6324af..4bcb40655772 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1082,6 +1082,10 @@ public class Editor {
     }
 
     private void startDragAndDrop() {
+        // TODO: Fix drag and drop in full screen extracted mode.
+        if (mTextView.isInExtractedMode()) {
+            return;
+        }
         final int start = mTextView.getSelectionStart();
         final int end = mTextView.getSelectionEnd();
         CharSequence selectedText = mTextView.getTransformedText(start, end);