Merge "Fix raname behavior"

3 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java
index b43a798c6..129f46535 100644
--- a/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -726,9 +726,6 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
 
             case R.id.action_menu_rename:
             case R.id.dir_menu_rename:
-                // Exit selection mode first, so we avoid deselecting deleted
-                // (renamed) documents.
-                mActionModeController.finishActionMode();
                 renameDocuments(selection);
                 return true;
 
diff --git a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
index d16a0d626..8fae42ea8 100644
--- a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
+++ b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
@@ -230,6 +230,7 @@ public class RenameDocumentFragment extends DialogFragment {
             if (mDialog != null) {
                 mDialog.dismiss();
             }
+            mActivity.getInjector().selectionMgr.clearSelection();
             mActivity.reloadDocumentsIfNeeded();
         }
     }
diff --git a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
index 58b2e5810..2e66117ad 100644
--- a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
+++ b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
@@ -132,6 +132,8 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> {
         bots.directory.assertDocumentsPresent(fileName1);
         bots.directory.assertDocumentsAbsent(newName);
         bots.directory.assertDocumentsCount(4);
+
+        bots.directory.assertSelection(1);
     }
 
     public void testRenameDir() throws Exception {