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

Commit d5be7d23 authored by Ben Reich's avatar Ben Reich
Browse files

Fix up crash in MenuManager when selection is active 

When the menus have been moved from the ActionBar to the NavigationView
it means the menu updating code no longer retrieves the menu from the
BaseActivity. There was some code that was causing a crash on paste in
as it was trying to use the old update path instead. Opt for the new
update method when the flag is enabled instead.

This also adds a regression test that expectedly fails currently but
with the fix will succeed, this also should pass with or without the
flag on.

Fix: 399752575
Bug: 383669583
Flag: com.android.documentsui.flags.use_material3
Test: atest testKeyboard_PasteDocumentWhileSelectionActive
Change-Id: Ic83e1239abee824360a11075ee24c49274f57318
parent 9d04a405

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

+5 −1
Original line number Diff line number Diff line
@@ -1535,7 +1535,11 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On 
                // For orientation changed case, sometimes the docs loading comes after the menu

                // update. We need to update the menu here to ensure the status is correct.

                mInjector.menuManager.updateModel(mModel);

                if (useMaterial3()) {

                    mActivity.getNavigator().updateActionMenu();

                } else {

                    mInjector.menuManager.updateOptionMenu();

                }

                if (VersionUtils.isAtLeastS()) {

                    mActivity.updateHeader(update.hasCrossProfileException());

                } else {

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

+15 −0
Original line number Diff line number Diff line
@@ -124,6 +124,21 @@ public class FileManagementUiTest extends ActivityTest<FilesActivity> { 
        bots.directory.waitForDocument("file1.png");

    }



    @HugeLongTest

    public void testKeyboard_PasteDocumentWhileSelectionActive() throws Exception {

        bots.directory.selectDocument("file1.png", 1);

        bots.keyboard.pressKey(KeyEvent.KEYCODE_C, KeyEvent.META_CTRL_ON);



        device.waitForIdle();

        bots.directory.openDocument("Dir1");

        bots.directory.selectDocument("ChildDir1", 1);



        bots.keyboard.pressKey(KeyEvent.KEYCODE_V, KeyEvent.META_CTRL_ON);

        device.waitForIdle();



        bots.directory.assertDocumentsPresent("file1.png");

    }



    public void testDeleteDocument_Cancel() throws Exception {

        bots.directory.selectDocument("file1.png", 1);

        device.waitForIdle();