Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 439e67e4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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.
parents 90336c63 524811c5

src/com/android/documentsui/DocumentsActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -574,7 +574,8 @@ public class DocumentsActivity extends Activity { 
        // 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 @@ public class DocumentsActivity extends Activity { 
            if (cwd == null) {

                grid.setVisible(false);

                list.setVisible(false);

                fileSizeVisible = false;

            }



            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);



        advanced.setVisible(mState.action != ACTION_MANAGE);

        fileSize.setVisible(mState.action != ACTION_MANAGE);

        fileSize.setVisible(fileSizeVisible);



        return true;

    }