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

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

Merge "Don't deselect files after copy."

parents 9179b2ac c2b4b3dc

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

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




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

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





            final int id = item.getItemId();

            switch (item.getItemId()) {

            if (id == R.id.menu_open) {

                case R.id.menu_open:

                    openDocuments(selection);

                    openDocuments(selection);

                    mode.finish();

                    mode.finish();

                    return true;

                    return true;





            } else if (id == R.id.menu_share) {

                case R.id.menu_share:

                    shareDocuments(selection);

                    shareDocuments(selection);

                    mode.finish();

                    mode.finish();

                    return true;

                    return true;





            } else if (id == R.id.menu_delete) {

                case R.id.menu_delete:

                    // Exit selection mode first, so we avoid deselecting deleted documents.

                    // Exit selection mode first, so we avoid deselecting deleted documents.

                    mode.finish();

                    mode.finish();

                    deleteDocuments(selection);

                    deleteDocuments(selection);

                    return true;

                    return true;





            } else if (id == R.id.menu_copy_to) {

                case R.id.menu_copy_to:

                    transferDocuments(selection, CopyService.TRANSFER_MODE_COPY);

                    transferDocuments(selection, CopyService.TRANSFER_MODE_COPY);

                    mode.finish();

                    mode.finish();

                    return true;

                    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.

                    // Exit selection mode first, so we avoid deselecting deleted documents.

                    mode.finish();

                    mode.finish();

                    transferDocuments(selection, CopyService.TRANSFER_MODE_MOVE);

                    transferDocuments(selection, CopyService.TRANSFER_MODE_MOVE);

                    return true;

                    return true;





            } else if (id == R.id.menu_copy_to_clipboard) {

                case R.id.menu_copy_to_clipboard:

                    copySelectionToClipboard(selection);

                    copySelectionToClipboard(selection);

                mode.finish();

                    return true;

                    return true;





            } else if (id == R.id.menu_select_all) {

                case R.id.menu_select_all:

                    selectAllFiles();

                    selectAllFiles();

                    return true;

                    return true;





            } else {

                default:

                    if (DEBUG) Log.d(TAG, "Unhandled menu item selected: " + item);

                    return false;

                    return false;

            }

            }

        }

        }