Merge "DO NOT MERGE: Disable drag n\' drop in DocumentsActivity." into nyc-dev

am: 6e685dc3c5

* commit '6e685dc3c519526a0f38ec5ee9e81e1f57e0fa36':
  DO NOT MERGE: Disable drag n' drop in DocumentsActivity.

Change-Id: I9e4424bfbffc46cd1880241b6961c0f0ca75aab4
This commit is contained in:
Garfield, Tan
2016-04-22 17:47:33 +00:00
committed by android-build-merger
2 changed files with 19 additions and 2 deletions

View File

@@ -1174,8 +1174,10 @@ public class DirectoryFragment extends Fragment
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() {

View File

@@ -81,6 +81,11 @@ public abstract class FragmentTuner {
*/
abstract boolean enableManagedMode();
/**
* Whether drag n' drop is allowed in this context
*/
abstract boolean allowDragNDrop();
/**
* Provides support for Platform specific specializations of DirectoryFragment.
*/
@@ -191,6 +196,11 @@ public abstract class FragmentTuner {
public boolean enableManagedMode() {
return false;
}
@Override
public boolean allowDragNDrop() {
return false;
}
}
/**
@@ -255,6 +265,11 @@ public abstract class FragmentTuner {
&& mState.stack.root.isDownloads()
&& mState.stack.size() == 1;
}
@Override
public boolean allowDragNDrop() {
return true;
}
}
private static boolean isDirectory(String mimeType) {