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

Commit 04dc06f5 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 5198868 - Showing previous hidden options menu doesn't work 

Fix bad assumption in flagging action items.

Change-Id: Ic67b56195bc308e73d1564cbf1b77e41eaa4ecab
parent 77eb57fc

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

+2 −3
Original line number Diff line number Diff line
@@ -1057,9 +1057,8 @@ public class MenuBuilder implements Menu { 
                    mNonActionItems.add(item);

                }

            }

        } else if (mActionItems.size() + mNonActionItems.size() != getVisibleItems().size()) {

            // Nobody flagged anything, but if something doesn't add up then treat everything

            // as non-action items.

        } else {

            // Nobody flagged anything, everything is a non-action item.

            // (This happens during a first pass with no action-item presenters.)

            mActionItems.clear();

            mNonActionItems.clear();