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

Merge "Don\'t persist selection after restore." into nyc-dev

Browse Source 
am: 522a437786

* commit '522a4377863339d9486c833f5a39f8047576bfee':
  Don't persist selection after restore.

Change-Id: I9f9be7b8a5ffc0a3374cef0902ffeeee2add6d91
This commit is contained in:
Steve McKay
2016-05-06 22:22:42 +00:00
committed by android-build-merger
parent 443c032e52 522a437786
commit fd5affdc2c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,6 +170,7 @@ public class DirectoryFragment extends Fragment
private RootInfo mRoot; private RootInfo mRoot;
private DocumentInfo mDocument; private DocumentInfo mDocument;
private String mQuery = null; private String mQuery = null;
// Save selection found during creation so it can be restored during directory loading.
private Selection mSelection = null; private Selection mSelection = null;
private boolean mSearchMode = false; private boolean mSearchMode = false;
private @Nullable ActionMode mActionMode; private @Nullable ActionMode mActionMode;
@@ -698,7 +699,7 @@ public class DirectoryFragment extends Fragment
public final boolean onBackPressed() { public final boolean onBackPressed() {
if (mSelectionManager.hasSelection()) { 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(); mSelectionManager.clearSelection();
return true; return true;
} }
@@ -1817,6 +1818,7 @@ public class DirectoryFragment extends Fragment
if (mSelection != null) { if (mSelection != null) {
mSelectionManager.setItemsSelected(mSelection.toList(), true); mSelectionManager.setItemsSelected(mSelection.toList(), true);
mSelection.clear();
} }
// Restore any previous instance state // Restore any previous instance state