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

Commit a56dae3d authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Proper shutdown of ActionMode when selecting roots."

parents e5071601 353dbba5

src/com/android/documentsui/BaseActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ public abstract class BaseActivity 
            return;

        }



        mInjector.actionModeController.finishActionMode();

        mState.derivedMode = LocalPreferences.getViewMode(this, root, MODE_GRID);

        mSortController.onViewModeChanged(mState.derivedMode);

tests/functional/com/android/documentsui/FilesActivityUiTest.java

+10 −0
Original line number Diff line number Diff line
@@ -86,6 +86,16 @@ public class FilesActivityUiTest extends ActivityTest<FilesActivity> { 
        bots.directory.waitForDocument(dirName1);

    }



    public void testNavigate_whileHasSelection() throws Exception {



        bots.roots.openRoot(rootDir0.title);

        device.waitForIdle();

        bots.directory.selectDocument("file0.log", 1);



        // ensure no exception is thrown while navigating to a different root

        bots.roots.openRoot(rootDir1.title);

    }



    public void testRootChange_UpdatesSortHeader() throws Exception {



        // switch to separate display modes for two separate roots. Each