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

Commit 95f44e8f authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

Merge "Clear selection mode when changing root" into nyc-dev

parents 503d1ccc d559743a

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

+8 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public class DirectoryFragment extends Fragment 


    @Override

    public void onDestroyView() {

        super.onDestroyView();

        mSelectionManager.clearSelection();



        // Cancel any outstanding thumbnail requests

        final int count = mRecView.getChildCount();
@@ -223,6 +223,8 @@ public class DirectoryFragment extends Fragment 
            final View view = mRecView.getChildAt(i);

            cancelThumbnailTask(view);

        }



        super.onDestroyView();

    }



    @Override
@@ -308,12 +310,15 @@ public class DirectoryFragment extends Fragment 
    public void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);



        mSelectionManager.getSelection(mSelection);



        outState.putInt(Shared.EXTRA_TYPE, mType);

        outState.putParcelable(Shared.EXTRA_ROOT, mRoot);

        outState.putParcelable(Shared.EXTRA_DOC, mDocument);

        outState.putString(Shared.EXTRA_QUERY, mQuery);

        outState.putParcelable(Shared.EXTRA_SELECTION, mSelectionManager.getSelection());

        outState.putParcelable(Shared.EXTRA_SELECTION, mSelection);

        outState.putBoolean(Shared.EXTRA_SEARCH_MODE, mSearchMode);



    }



    @Override
@@ -1460,6 +1465,7 @@ public class DirectoryFragment extends Fragment 
        args.putParcelable(Shared.EXTRA_ROOT, root);

        args.putParcelable(Shared.EXTRA_DOC, doc);

        args.putString(Shared.EXTRA_QUERY, query);

        args.putParcelable(Shared.EXTRA_SELECTION, new Selection());



        final FragmentTransaction ft = fm.beginTransaction();

        switch (anim) {

packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.documentsui;



import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_1_ID;



import android.test.suitebuilder.annotation.LargeTest;
@@ -42,4 +43,13 @@ public class RootsUiTest extends ActivityTest<FilesActivity> { 
        bots.main.assertWindowTitle(ROOT_0_ID);

        assertDefaultContentOfTestDir0();

    }



    public void testRootChanged_ClearSelection() throws Exception {

        bots.directory.selectDocument(fileName1);

        bots.main.assertInActionMode(true);



        bots.roots.openRoot(ROOT_1_ID);

        bots.main.assertInActionMode(false);

    }



}

packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ public class UiBot extends BaseBot { 
        assertEquals(searchIconExists, findSearchViewIcon().exists());

    }



    public void assertInActionMode(boolean inActionMode) {

        UiObject actionModeBar = findActionModeBar();

        assertEquals(inActionMode, actionModeBar.exists());

    }



    public void openSearchView() throws UiObjectNotFoundException {

        UiObject searchView = findSearchView();

        searchView.click();