summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-10-09 18:11:36 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2012-10-09 19:20:27 -0700
commit14c4669916ae993b248f00c55daf0f17069903d9 (patch)
tree3c9317708c0a4e5af045a544bf05d793e457c3f1 /core
parent3b9e7f32380e179aa1e0718762e86ffa24cbab93 (diff)
downloadframeworks_base-14c4669916ae993b248f00c55daf0f17069903d9.zip
frameworks_base-14c4669916ae993b248f00c55daf0f17069903d9.tar.gz
frameworks_base-14c4669916ae993b248f00c55daf0f17069903d9.tar.bz2
Cannot force a shown item from an ActionMode into the overflow menu.
1. An app showing an action mode with a visible item that decides to move this item to the overflow menu cannot do so since the action menu is not updated properly. Specifically, ActionMenuPresenter does not clear the "is action button" property of a menu item neither requires nor requests an action button, i.e. the item's "show as action" property changed to be never shown on the action bar. bug:7319766 Change-Id: I5cfda6269466fafca1f039a3bab6397392ae9f17
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/view/menu/ActionMenuPresenter.java3
1 files changed, 3 insertions, 0 deletions
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 @@ public class ActionMenuPresenter extends BaseMenuPresenter
if (isAction) maxActions--;
item.setIsActionButton(isAction);
+ } else {
+ // Neither requires nor requests an action button.
+ item.setIsActionButton(false);
}
}
return true;