Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finish selection mode after copyto and share..." into nyc-dev

Browse Source 
am: 94e3b80d5b

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

Change-Id: If4a47f84569e1cb58eb4d0f3c8e209e78177e615
This commit is contained in:
Steve McKay
2016-05-04 21:37:39 +00:00
committed by android-build-merger
parent 8f04f5f3ba 94e3b80d5b
commit 6818cd5540
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
View File

@@ -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: