commit da161f0b1706d2de70d519a5ebfcdb99922dc1ad
author Steve McKay <smckay@google.com> Mon Jan 11 23:33:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 11 23:33:00 2016 +0000
tree 00d982c2f569963c31234d917f11b878508a8b44
parent 987635710f6da035112827139181f098a8db4d76
parent 7c7e684b787bb27db46b0148727602449f86ee88

Merge "Fix bug where both list and grid buttons are visible."

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index ca8ef2e..223af89 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -308,8 +308,10 @@
         mSearchManager.showMenu(!picking);
 
         // No display options in recent directories
-        grid.setVisible(!(picking && recents));
-        list.setVisible(!(picking && recents));
+        if (picking && recents) {
+            grid.setVisible(false);
+            list.setVisible(false);
+        }
 
         fileSize.setVisible(fileSize.isVisible() && !picking);
         settings.setVisible(false);