From 99544dd0f42988fc17a49fcb39ac6971b57cd25d Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Fri, 6 May 2016 12:07:54 -0700 Subject: Don't persist selection after restore. Bug: 28469988 Change-Id: I1fec774d8ebdec13b33262d7fe8e17fccd84b657 --- .../src/com/android/documentsui/dirlist/DirectoryFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index 2db8fad714a9..5e7a229fda9d 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -170,6 +170,7 @@ public class DirectoryFragment extends Fragment private RootInfo mRoot; private DocumentInfo mDocument; private String mQuery = null; + // Save selection found during creation so it can be restored during directory loading. private Selection mSelection = null; private boolean mSearchMode = false; private @Nullable ActionMode mActionMode; @@ -698,7 +699,7 @@ public class DirectoryFragment extends Fragment public final boolean onBackPressed() { if (mSelectionManager.hasSelection()) { - if (DEBUG) Log.d(TAG, "Clearing selection on back pressed."); + if (DEBUG) Log.d(TAG, "Clearing selection on selection manager."); mSelectionManager.clearSelection(); return true; } @@ -1817,6 +1818,7 @@ public class DirectoryFragment extends Fragment if (mSelection != null) { mSelectionManager.setItemsSelected(mSelection.toList(), true); + mSelection.clear(); } // Restore any previous instance state -- cgit v1.2.3-59-g8ed1b