Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Recent directories can\'t show file size." into lmp-mr1-dev

Browse Source 
automerge: 379551e

* commit '379551ebd54947cdff5600af52940f9c283aac1f':
  Recent directories can't show file size.
This commit is contained in:
Jeff Sharkey
2014-10-24 20:44:53 +00:00
committed by android-build-merger
parent 181c18efd4 379551ebd5
commit 043f8dd274
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
View File

@@ -574,7 +574,8 @@ public class DocumentsActivity extends Activity {
// Only sort by size when visible // Only sort by size when visible
sortSize.setVisible(mState.showSize); 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) { if (mState.action == ACTION_CREATE || mState.action == ACTION_OPEN_TREE) {
createDir.setVisible(cwd != null && cwd.isCreateSupported()); createDir.setVisible(cwd != null && cwd.isCreateSupported());
searchVisible = false; searchVisible = false;
@@ -583,6 +584,7 @@ public class DocumentsActivity extends Activity {
if (cwd == null) { if (cwd == null) {
grid.setVisible(false); grid.setVisible(false);
list.setVisible(false); list.setVisible(false);
fileSizeVisible = false;
} }
if (mState.action == ACTION_CREATE) { if (mState.action == ACTION_CREATE) {
@@ -604,7 +606,7 @@ public class DocumentsActivity extends Activity {
? R.string.menu_file_size_hide : R.string.menu_file_size_show); ? R.string.menu_file_size_hide : R.string.menu_file_size_show);
advanced.setVisible(mState.action != ACTION_MANAGE); advanced.setVisible(mState.action != ACTION_MANAGE);
fileSize.setVisible(mState.action != ACTION_MANAGE); fileSize.setVisible(fileSizeVisible);
return true; return true;
} }