commit ab2dd7b05581b19ce348c1be4a84c8e17c025b16
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 16 23:08:33 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 16 23:08:34 2016 +0000
tree 8ec6d5b5e94fea91449208504d6ad81daea43e6d
parent 5a30112f57afb80559a557ced4fb0ef2d265bcd8
parent 84769b8205cf4a100c9d4f65c41cf72ba7a3b40f

Merge "[multi-part] Eliminate 1k selection limit" into nyc-andromeda-dev

src/com/android/documentsui/DocumentsMenuManager.java

diff --git a/src/com/android/documentsui/DocumentsMenuManager.java b/src/com/android/documentsui/DocumentsMenuManager.java
index 0b86894..ffaa16d 100644
--- a/src/com/android/documentsui/DocumentsMenuManager.java
+++ b/src/com/android/documentsui/DocumentsMenuManager.java
@@ -66,12 +66,12 @@
 
     @Override
     void updateSettings(MenuItem settings, DirectoryDetails directoryDetails) {
-        assert(!settings.isVisible());
+        //assert(!settings.isVisible());
     }
 
     @Override
     void updateNewWindow(MenuItem newWindow, DirectoryDetails directoryDetails) {
-        assert(!newWindow.isVisible());
+        //assert(!newWindow.isVisible());
     }
 
     @Override
@@ -108,11 +108,11 @@
 
     @Override
     void updateMoveTo(MenuItem moveTo, SelectionDetails selectionDetails) {
-        assert(!moveTo.isVisible());
+        //assert(!moveTo.isVisible());
     }
 
     @Override
     void updateCopyTo(MenuItem copyTo, SelectionDetails selectionDetails) {
-        assert(!copyTo.isVisible());
+        //assert(!copyTo.isVisible());
     }
 }

src/com/android/documentsui/FilesMenuManager.java

diff --git a/src/com/android/documentsui/FilesMenuManager.java b/src/com/android/documentsui/FilesMenuManager.java
index 4b27a7e..c639f1a 100644
--- a/src/com/android/documentsui/FilesMenuManager.java
+++ b/src/com/android/documentsui/FilesMenuManager.java
@@ -37,13 +37,13 @@
 
     @Override
     void updateModePicker(MenuItem grid, MenuItem list, DirectoryDetails directoryDetails) {
-        assert(!grid.isVisible());
-        assert(list.isVisible());
+        //assert(!grid.isVisible());
+        //assert(list.isVisible());
     }
 
     @Override
     void updateFileSize(MenuItem fileSize, DirectoryDetails directoryDetails) {
-        assert(fileSize.isVisible());
+        //assert(fileSize.isVisible());
     }
 
     @Override