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

This commit is contained in:
Garfield Tan
2016-04-22 17:17:14 +00:00
committed by Android (Google) Code Review
2 changed files with 19 additions and 2 deletions

View File

@@ -1174,9 +1174,11 @@ public class DirectoryFragment extends Fragment
view.setOnDragListener(mOnDragListener); view.setOnDragListener(mOnDragListener);
} }
if (mTuner.allowDragNDrop()) {
// Make all items draggable. // Make all items draggable.
view.setOnLongClickListener(onLongClickListener); view.setOnLongClickListener(onLongClickListener);
} }
}
private View.OnDragListener mOnDragListener = new View.OnDragListener() { private View.OnDragListener mOnDragListener = new View.OnDragListener() {
@Override @Override

View File

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