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

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

Fix bug 4108953 - Old-style menus do not show menu items marked as 

showAsAction="always"

Change-Id: I63299143ea780abeed6dcdece6934f0e704b46a2
parent 93aa58fd

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

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter { 
                if (groupId != 0) {

                    seenGroups.put(groupId, true);

                }

                item.setIsActionButton(true);

            } else if (item.requestsActionButton()) {

                // Items in a group with other items that already have an action slot

                // can break the max actions rule, but not the width limit.

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

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ public final class MenuItemImpl implements MenuItem { 
    }

    

    public boolean isActionButton() {

        return (mFlags & IS_ACTION) == IS_ACTION || requiresActionButton();

        return (mFlags & IS_ACTION) == IS_ACTION;

    }

    

    public boolean requestsActionButton() {