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

Commit 379551eb authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents 6af7d76e 0166ddf5

packages/DocumentsUI/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;

    }