am de9e026f: am d849afb1: am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev

* commit 'de9e026f10fde0726db97af002989b1248e4aa51': Cannot force a shown item from an ActionMode into the overflow menu.
2012-10-10 08:41:58 -07:00
parent dce0318b67 de9e026f10
commit 3c444d2c13
1 changed files with 3 additions and 0 deletions
--- a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
@@ -476,6 +476,9 @@ public class ActionMenuPresenter extends BaseMenuPresenter
                if (isAction) maxActions--;

                item.setIsActionButton(isAction);
+            } else {
+                // Neither requires nor requests an action button.
+                item.setIsActionButton(false);
            }
        }
        return true;