commit 8e258c604292354d71f0b53c7213a8652405b9aa
author Steve McKay <smckay@google.com> Wed May 06 14:27:57 2015 -0700
committer Steve McKay <smckay@google.com> Mon May 11 11:48:51 2015 -0700
tree d74d7570cdf93a699e102e3c27f07b2ab4c5fd8c
parent 572007a164ca9a4c7b42b304f784c915a34bfe17

Minor updates improving menu behavior.

1) Ensure advanced options are always visible.
2) Position search before create folder.
3) Force create-directory into the overflow menu.

And the rider on the bill...

4) Disable Drag/Drop with a static boolean flag.

Change-Id: I173cedf0eb7e11d824377b77ce701eb88de7c1e1

src/com/android/documentsui/DirectoryFragment.java

diff --git a/src/com/android/documentsui/DirectoryFragment.java b/src/com/android/documentsui/DirectoryFragment.java
index 7433c21..de738e2 100644
--- a/src/com/android/documentsui/DirectoryFragment.java
+++ b/src/com/android/documentsui/DirectoryFragment.java
@@ -56,6 +56,7 @@
 import android.os.CancellationSignal;
 import android.os.OperationCanceledException;
 import android.os.Parcelable;
+import android.os.SystemProperties;
 import android.provider.DocumentsContract;
 import android.provider.DocumentsContract.Document;
 import android.text.format.DateUtils;
@@ -133,6 +134,8 @@
     private DocumentsAdapter mAdapter;
     private LoaderCallbacks<DirectoryResult> mCallbacks;
 
+    private static final boolean DEBUG_ENABLE_DND = false;
+
     private static final String EXTRA_TYPE = "type";
     private static final String EXTRA_ROOT = "root";
     private static final String EXTRA_DOC = "doc";
@@ -208,7 +211,6 @@
         mListView.setOnItemClickListener(mItemListener);
         mListView.setMultiChoiceModeListener(mMultiListener);
         mListView.setRecyclerListener(mRecycleListener);
-        setupDragAndDropOnDirectoryView(mListView);
 
         // Indent our list divider to align with text
         final Drawable divider = mListView.getDivider();
@@ -224,7 +226,11 @@
         mGridView.setOnItemClickListener(mItemListener);
         mGridView.setMultiChoiceModeListener(mMultiListener);
         mGridView.setRecyclerListener(mRecycleListener);
-        setupDragAndDropOnDirectoryView(mGridView);
+
+        if (DEBUG_ENABLE_DND) {
+            setupDragAndDropOnDirectoryView(mListView);
+            setupDragAndDropOnDirectoryView(mGridView);
+        }
 
         return view;
     }
@@ -1010,7 +1016,9 @@
             if (icon1 != null) icon1.setAlpha(iconAlpha);
             if (icon2 != null) icon2.setAlpha(iconAlpha);
 
-            setupDragAndDropOnDocumentView(convertView, cursor);
+            if (DEBUG_ENABLE_DND) {
+                setupDragAndDropOnDocumentView(convertView, cursor);
+            }
 
             return convertView;
         }