drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev

Browse Source 
* commit '1262d0c864acd9b5cb87767e11de6bdf1cbf2f39':
  Fix action menu visibility callbacks for nested popups
This commit is contained in:
Adam Powell
2013-11-04 10:01:46 -08:00
committed by Android Git Automerger
parent 9382a07161 1262d0c864
commit fe803958d8
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/view/menu/ActionMenuPresenter.java
View File

@ -721,7 +721,8 @@ public class ActionMenuPresenter extends BaseMenuPresenter
if (subMenu == null) return false; if (subMenu == null) return false;
mOpenSubMenuId = ((SubMenuBuilder) subMenu).getItem().getItemId(); mOpenSubMenuId = ((SubMenuBuilder) subMenu).getItem().getItemId();
return false; final MenuPresenter.Callback cb = getCallback();
return cb != null ? cb.onOpenSubMenu(subMenu) : false;
} }
@Override @Override
@ -729,6 +730,10 @@ public class ActionMenuPresenter extends BaseMenuPresenter
if (menu instanceof SubMenuBuilder) { if (menu instanceof SubMenuBuilder) {
((SubMenuBuilder) menu).getRootMenu().close(false); ((SubMenuBuilder) menu).getRootMenu().close(false);
} }
final MenuPresenter.Callback cb = getCallback();
if (cb != null) {
cb.onCloseMenu(menu, allMenusAreClosing);
}
} }
} }

4
core/java/com/android/internal/view/menu/BaseMenuPresenter.java
View File

@ -144,6 +144,10 @@ public abstract class BaseMenuPresenter implements MenuPresenter {
mCallback = cb; mCallback = cb;
} }
public Callback getCallback() {
return mCallback;
}
/** /**
* Create a new item view that can be re-bound to other item data later. * Create a new item view that can be re-bound to other item data later.
* *