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

Commit da0755ee authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Finish selection mode after copyto and share..." into nyc-dev am: 94e3b80d am: 6818cd55 

am: f9cb0774

* commit 'f9cb0774':
  Finish selection mode after copyto and share...

Change-Id: Ic896d181603be626c17edee5f0d6f7abebd918b1
parents 2c14a588 f9cb0774

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

+5 −0
Original line number Diff line number Diff line
@@ -653,6 +653,8 @@ public class DirectoryFragment extends Fragment 


                case R.id.menu_share:

                    shareDocuments(selection);

                    // TODO: Only finish selection if share action is completed.

                    mode.finish();

                    return true;



                case R.id.menu_delete:
@@ -663,6 +665,9 @@ public class DirectoryFragment extends Fragment 


                case R.id.menu_copy_to:

                    transferDocuments(selection, FileOperationService.OPERATION_COPY);

                    // TODO: Only finish selection mode if copy-to is not canceled.

                    // Need to plum down into handling the way we do with deleteDocuments.

                    mode.finish();

                    return true;



                case R.id.menu_move_to: