Commit 3c444d2c authored Oct 10, 2012 by Svetoslav Ganov Committed by Android Git Automerger Oct 10, 2012

am de9e026f: am d849afb1: am a726e23d: Merge "Cannot force a shown item from...

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

* commit 'de9e026f':
  Cannot force a shown item from an ActionMode into the overflow menu.

parents dce0318b de9e026f

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;