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

am: 6818cd5540

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

Change-Id: I2d52ff873397d59bddd0bd6a135a88c3c1b503c3
This commit is contained in:
Steve McKay
2016-05-04 21:55:06 +00:00
committed by android-build-merger

View File

@@ -651,6 +651,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:
@@ -661,6 +663,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: