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

Commit 9abe3725 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Don't enable new folder in downloads..." into nyc-dev

parents b1d19ab1 1abf6cfa

src/com/android/documentsui/DocumentsActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -232,12 +232,13 @@ public class DocumentsActivity extends BaseActivity { 
        final MenuItem list = menu.findItem(R.id.menu_list);

        final MenuItem fileSize = menu.findItem(R.id.menu_file_size);



        boolean recents = cwd == null;



        createDir.setVisible(picking && !recents && cwd.isCreateSupported());

        createDir.setVisible(picking);

        createDir.setEnabled(canCreateDirectory());



        // No display options in recent directories

        if (picking && recents) {

        boolean inRecents = cwd == null;

        if (picking && inRecents) {

            grid.setVisible(false);

            list.setVisible(false);

        }

src/com/android/documentsui/dirlist/DirectoryFragment.java

+9 −0
Original line number Diff line number Diff line
@@ -833,6 +833,15 @@ public class DirectoryFragment extends Fragment 
                getActivity(),

                DocumentsActivity.class);





        // Relay any config overrides bits present in the original intent.

        Intent original = getActivity().getIntent();

        if (original != null && original.hasExtra(Shared.EXTRA_PRODUCTIVITY_MODE)) {

            intent.putExtra(

                    Shared.EXTRA_PRODUCTIVITY_MODE,

                    original.getBooleanExtra(Shared.EXTRA_PRODUCTIVITY_MODE, false));

        }



        // Set an appropriate title on the drawer when it is shown in the picker.

        // Coupled with the fact that we auto-open the drawer for copy/move operations

        // it should basically be the thing people see first.