Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2011-08-22 18:15:18 -07:00
committed by Android (Google) Code Review
parent 76a05fefbd 04dc06f52a
commit e20c279d9a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/view/menu/MenuBuilder.java
View File

@@ -1057,9 +1057,8 @@ public class MenuBuilder implements Menu {
mNonActionItems.add(item); mNonActionItems.add(item);
} }
} }
} else if (mActionItems.size() + mNonActionItems.size() != getVisibleItems().size()) { } else {
// Nobody flagged anything, but if something doesn't add up then treat everything // Nobody flagged anything, everything is a non-action item.
// as non-action items.
// (This happens during a first pass with no action-item presenters.) // (This happens during a first pass with no action-item presenters.)
mActionItems.clear(); mActionItems.clear();
mNonActionItems.clear(); mNonActionItems.clear();