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

Commit f0b2bf30 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: d67e16af

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

Change-Id: I48ca3c5e0049ff972a5432f8d5e3c983048a823e
parents ebf0d12f d67e16af

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

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




                case R.id.menu_share:

                case R.id.menu_share:

                    shareDocuments(selection);

                    shareDocuments(selection);

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

                    mode.finish();

                    return true;

                    return true;





                case R.id.menu_delete:

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




                case R.id.menu_copy_to:

                case R.id.menu_copy_to:

                    transferDocuments(selection, FileOperationService.OPERATION_COPY);

                    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;

                    return true;





                case R.id.menu_move_to:

                case R.id.menu_move_to: