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

Merge "Minor cleanups to delete support." into nyc-dev

Browse Source
This commit is contained in:
Steve McKay
2016-04-14 01:23:10 +00:00
committed by Android (Google) Code Review
parent e6036ad094 256724ea20
commit 282c458cda
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -524,6 +524,7 @@ public class DirectoryFragment extends Fragment
} }
if (mActionMode != null) { if (mActionMode != null) {
assert(!mSelected.isEmpty());
final String title = Shared.getQuantityString(getActivity(), final String title = Shared.getQuantityString(getActivity(),
R.plurals.elements_selected, mSelected.size()); R.plurals.elements_selected, mSelected.size());
mActionMode.setTitle(title); mActionMode.setTitle(title);
@@ -809,6 +810,8 @@ public class DirectoryFragment extends Fragment
// the user cancels the delete. // the user cancels the delete.
if (mActionMode != null) { if (mActionMode != null) {
mActionMode.finish(); mActionMode.finish();
} else {
Log.w(TAG, "Action mode is null before deleting documents.");
} }
// Hide the files in the UI...since the operation // Hide the files in the UI...since the operation
// might be queued up on FileOperationService. // might be queued up on FileOperationService.
@@ -1436,7 +1439,8 @@ public class DirectoryFragment extends Fragment
// This has to be handled here instead of in a keyboard shortcut, because // This has to be handled here instead of in a keyboard shortcut, because
// keyboard shortcuts all have to be modified with the 'Ctrl' key. // keyboard shortcuts all have to be modified with the 'Ctrl' key.
if (mSelectionManager.hasSelection()) { if (mSelectionManager.hasSelection()) {
deleteDocuments(mSelectionManager.getSelection()); Selection selection = mSelectionManager.getSelection(new Selection());
deleteDocuments(selection);
} }
// Always handle the key, even if there was nothing to delete. This is a // Always handle the key, even if there was nothing to delete. This is a
// precaution to prevent other handlers from potentially picking up the event // precaution to prevent other handlers from potentially picking up the event