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

Commit 306ebd6b authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Automerger Merge Worker
Browse files

Merge "A11y focus lost click on grid list menu" into rvc-dev am: 1b2c7300 am: ed9eea8d 

Change-Id: I36e476b401e46ec4e0c3095fdeccea361c17d339
parents 2056d0a1 ed9eea8d

src/com/android/documentsui/MenuManager.java

+8 −2
Original line number Diff line number Diff line
@@ -255,9 +255,15 @@ public abstract class MenuManager { 
            List<KeyboardShortcutGroup> data, IntFunction<String> stringSupplier);



    protected void updateModePicker(MenuItem grid, MenuItem list) {

        // The order of enabling disabling menu item in wrong order removed accessibility focus.

        if (mState.derivedMode != State.MODE_LIST) {

            Menus.setEnabledAndVisible(list, mState.derivedMode != State.MODE_LIST);

            Menus.setEnabledAndVisible(grid, mState.derivedMode != State.MODE_GRID);

        } else {

            Menus.setEnabledAndVisible(grid, mState.derivedMode != State.MODE_GRID);

            Menus.setEnabledAndVisible(list, mState.derivedMode != State.MODE_LIST);

        }

    }



    protected void updateShowHiddenFiles(MenuItem showHidden) {

        Menus.setEnabledAndVisible(showHidden, true);