Merge "Don't deselect files after copy." (ad133298) · Commits · e / os / android_frameworks_base

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

+32 −32

Original line number	Diff line number	Diff line
		@@ -741,44 +741,44 @@ public class DirectoryFragment extends Fragment {

		Selection selection = mSelectionManager.getSelection(new Selection());

		final int id = item.getItemId();
		if (id == R.id.menu_open) {
		switch (item.getItemId()) {
		case R.id.menu_open:
		openDocuments(selection);
		mode.finish();
		return true;

		} else if (id == R.id.menu_share) {
		case R.id.menu_share:
		shareDocuments(selection);
		mode.finish();
		return true;

		} else if (id == R.id.menu_delete) {
		case R.id.menu_delete:
		// Exit selection mode first, so we avoid deselecting deleted documents.
		mode.finish();
		deleteDocuments(selection);
		return true;

		} else if (id == R.id.menu_copy_to) {
		case R.id.menu_copy_to:
		transferDocuments(selection, CopyService.TRANSFER_MODE_COPY);
		mode.finish();
		return true;

		} else if (id == R.id.menu_move_to) {
		case R.id.menu_move_to:
		// Exit selection mode first, so we avoid deselecting deleted documents.
		mode.finish();
		transferDocuments(selection, CopyService.TRANSFER_MODE_MOVE);
		return true;

		} else if (id == R.id.menu_copy_to_clipboard) {
		case R.id.menu_copy_to_clipboard:
		copySelectionToClipboard(selection);
		mode.finish();
		return true;

		} else if (id == R.id.menu_select_all) {
		case R.id.menu_select_all:
		selectAllFiles();
		return true;

		} else {
		default:
		if (DEBUG) Log.d(TAG, "Unhandled menu item selected: " + item);
		return false;
		}
		}