Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ce082a4 authored by Oren Blasberg's avatar Oren Blasberg Committed by Android (Google) Code Review
Browse files

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

parents e1efbcee 9022c712

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

+2 −2
Original line number Diff line number Diff line
@@ -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)) {