commit | a726e23d7b13824ede2cdc185ce846238d348604 | [log] [tgz] |
---|---|---|
author | Svetoslav Ganov <svetoslavganov@google.com> | Tue Oct 09 22:01:55 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 09 22:01:55 2012 -0700 |
tree | 6a3cda59c7b6567611b39703a120778f7b835098 | |
parent | 30417507821413bda6dc5868c68d1e9b5a7bced6 [diff] | |
parent | 14c4669916ae993b248f00c55daf0f17069903d9 [diff] |
Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev
diff --git a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java index 2811332..4bb6d06 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java +++ b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
@@ -476,6 +476,9 @@ if (isAction) maxActions--; item.setIsActionButton(isAction); + } else { + // Neither requires nor requests an action button. + item.setIsActionButton(false); } } return true;