Merge "Fix action menu visibility callbacks for nested popups" into klp-dev

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

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

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

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