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

Commit c0cc6805 authored by Adam Powell's avatar Adam Powell
Browse files

Fix a bug in submenu presenter priority handling 

Now that overflow menus and the PhoneWindow-level ListMenuPresenter
can coexist, make sure that ListMenuPresenter handles submenus spawned
by itself. Introduce an internal API for menus to prefer a specific
presenter when performing item actions.

Bug 11979407

Change-Id: Id0b8fcbb8b310cbb3a63a1e5ea7a89de5d53f86f
parent d786a190

core/java/com/android/internal/view/menu/ListMenuPresenter.java

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick 


    @Override

    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

        mMenu.performItemAction(mAdapter.getItem(position), 0);

        mMenu.performItemAction(mAdapter.getItem(position), this, 0);

    }



    @Override

core/java/com/android/internal/view/menu/MenuBuilder.java

+12 −2
Original line number Diff line number Diff line
@@ -247,11 +247,17 @@ public class MenuBuilder implements Menu { 
        startDispatchingItemsChanged();

    }

    

    private boolean dispatchSubMenuSelected(SubMenuBuilder subMenu) {

    private boolean dispatchSubMenuSelected(SubMenuBuilder subMenu,

            MenuPresenter preferredPresenter) {

        if (mPresenters.isEmpty()) return false;



        boolean result = false;



        // Try the preferred presenter first.

        if (preferredPresenter != null) {

            result = preferredPresenter.onSubMenuSelected(subMenu);

        }



        for (WeakReference<MenuPresenter> ref : mPresenters) {

            final MenuPresenter presenter = ref.get();

            if (presenter == null) {
@@ -865,6 +871,10 @@ public class MenuBuilder implements Menu { 
    }



    public boolean performItemAction(MenuItem item, int flags) {

        return performItemAction(item, null, flags);

    }



    public boolean performItemAction(MenuItem item, MenuPresenter preferredPresenter, int flags) {

        MenuItemImpl itemImpl = (MenuItemImpl) item;

        

        if (itemImpl == null || !itemImpl.isEnabled()) {
@@ -889,7 +899,7 @@ public class MenuBuilder implements Menu { 
            if (providerHasSubMenu) {

                provider.onPrepareSubMenu(subMenu);

            }

            invoked |= dispatchSubMenuSelected(subMenu);

            invoked |= dispatchSubMenuSelected(subMenu, preferredPresenter);

            if (!invoked) close(true);

        } else {

            if ((flags & FLAG_PERFORM_NO_CLOSE) == 0) {