Merge "Fix bug 5198868 - Showing previous hidden options menu doesn't work"
diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java
index 5622b44..c30e83b 100644
--- a/core/java/com/android/internal/view/menu/MenuBuilder.java
+++ b/core/java/com/android/internal/view/menu/MenuBuilder.java
@@ -1057,9 +1057,8 @@
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();