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

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

Browse Source
This commit is contained in:
Steve McKay
2016-04-11 20:41:29 +00:00
committed by Android (Google) Code Review
parent f9104e33e4 c15528afa6
commit eb76763b80
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
View File

@@ -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.