Merge "Fix top level menu lingering when submenu opens." into nyc-dev

This commit is contained in:
Oren Blasberg
2016-04-07 22:43:16 +00:00
committed by Android (Google) Code Review

View File

@@ -208,7 +208,7 @@ final class StandardMenuPopup extends MenuPopup implements OnDismissListener, On
@Override
public void show() {
if (!tryShow()) {
throw new IllegalStateException("MenuPopupHelper cannot be used without an anchor");
throw new IllegalStateException("StandardMenuPopup cannot be used without an anchor");
}
}
@@ -273,7 +273,7 @@ final class StandardMenuPopup extends MenuPopup implements OnDismissListener, On
mOnDismissListener = null;
// Close this menu popup to make room for the submenu popup.
dismiss();
mMenu.close(false /* closeAllMenus */);
// Show the new sub-menu popup at the same location as this popup.
if (subPopup.tryShow(mXOffset, mYOffset)) {