Merge "DO NOT MERGE: Disable drag n' drop in DocumentsActivity." into nyc-dev
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 297fbc7..b67f6a2 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -1174,8 +1174,10 @@
view.setOnDragListener(mOnDragListener);
}
- // Make all items draggable.
- view.setOnLongClickListener(onLongClickListener);
+ if (mTuner.allowDragNDrop()) {
+ // Make all items draggable.
+ view.setOnLongClickListener(onLongClickListener);
+ }
}
private View.OnDragListener mOnDragListener = new View.OnDragListener() {
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
index 32fdb64..9e2b86a 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
@@ -82,6 +82,11 @@
abstract boolean enableManagedMode();
/**
+ * Whether drag n' drop is allowed in this context
+ */
+ abstract boolean allowDragNDrop();
+
+ /**
* Provides support for Platform specific specializations of DirectoryFragment.
*/
private static final class DocumentsTuner extends FragmentTuner {
@@ -191,6 +196,11 @@
public boolean enableManagedMode() {
return false;
}
+
+ @Override
+ public boolean allowDragNDrop() {
+ return false;
+ }
}
/**
@@ -255,6 +265,11 @@
&& mState.stack.root.isDownloads()
&& mState.stack.size() == 1;
}
+
+ @Override
+ public boolean allowDragNDrop() {
+ return true;
+ }
}
private static boolean isDirectory(String mimeType) {