Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e3ed23f authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Don\'t persist selection after restore." into nyc-dev am: 522a4377 

am: fd5affdc

* commit 'fd5affdc':
  Don't persist selection after restore.

Change-Id: I54479952ac3c9aee8321bf2d679f86e691a4d6ef
parents cb0f493e fd5affdc

packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -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