commit f135073fddff16595f7fd1c53ce4258ed96ec5cf
author Jeff Sharkey <jsharkey@android.com> Fri Oct 24 21:26:09 2014 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 24 21:26:09 2014 +0000
tree 9cb20bfc79466679e54afa6af31dc0e3786307f1
parent a9aecc0c29ce9b9692b9b317559f83b2520dcc43
parent 043f8dd27459f98537d46db77d482215b66c0ba0

Merge "Recent directories can\'t show file size." into lmp-mr1-dev automerge: 379551e
automerge: 043f8dd

* commit '043f8dd27459f98537d46db77d482215b66c0ba0':
  Recent directories can't show file size.

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 fef1f4a..219de38 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -574,7 +574,8 @@
         // Only sort by size when visible
         sortSize.setVisible(mState.showSize);
 
-        final boolean searchVisible;
+        boolean searchVisible;
+        boolean fileSizeVisible = mState.action != ACTION_MANAGE;
         if (mState.action == ACTION_CREATE || mState.action == ACTION_OPEN_TREE) {
             createDir.setVisible(cwd != null && cwd.isCreateSupported());
             searchVisible = false;
@@ -583,6 +584,7 @@
             if (cwd == null) {
                 grid.setVisible(false);
                 list.setVisible(false);
+                fileSizeVisible = false;
             }
 
             if (mState.action == ACTION_CREATE) {
@@ -604,7 +606,7 @@
                 ? R.string.menu_file_size_hide : R.string.menu_file_size_show);
 
         advanced.setVisible(mState.action != ACTION_MANAGE);
-        fileSize.setVisible(mState.action != ACTION_MANAGE);
+        fileSize.setVisible(fileSizeVisible);
 
         return true;
     }