Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e48d12b7: Merge "Fix ActionProviders that have submenus" into jb-dev

Browse Source 
* commit 'e48d12b78011ff5ddbb6838a038ea5384190ec92':
  Fix ActionProviders that have submenus
This commit is contained in:
Adam Powell
2012-05-15 11:31:13 -07:00
committed by Android Git Automerger
parent 95c9f90e55 e48d12b780
commit 8e49098f76
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/view/menu/MenuBuilder.java
View File

@@ -873,15 +873,20 @@ public class MenuBuilder implements Menu {
boolean invoked = itemImpl.invoke();
final ActionProvider provider = item.getActionProvider();
final boolean providerHasSubMenu = provider != null && provider.hasSubMenu();
if (itemImpl.hasCollapsibleActionView()) {
invoked |= itemImpl.expandActionView();
if (invoked) close(true);
} else if (item.hasSubMenu()) {
} else if (itemImpl.hasSubMenu() || providerHasSubMenu) {
close(false);
final SubMenuBuilder subMenu = (SubMenuBuilder) item.getSubMenu();
final ActionProvider provider = item.getActionProvider();
if (provider != null && provider.hasSubMenu()) {
if (!itemImpl.hasSubMenu()) {
itemImpl.setSubMenu(new SubMenuBuilder(getContext(), this, itemImpl));
}
final SubMenuBuilder subMenu = (SubMenuBuilder) itemImpl.getSubMenu();
if (providerHasSubMenu) {
provider.onPrepareSubMenu(subMenu);
}
invoked |= dispatchSubMenuSelected(subMenu);