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

Commit 890be6b9 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5217267 - Action bars and menu shortcuts"

parents 54717814 6055f3e0

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+6 −2
Original line number Diff line number Diff line
@@ -888,7 +888,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            // Mark as handled

            st.isHandled = true;



            if ((flags & Menu.FLAG_PERFORM_NO_CLOSE) == 0) {

            // Only close down the menu if we don't have an action bar keeping it open.

            if ((flags & Menu.FLAG_PERFORM_NO_CLOSE) == 0 && mActionBar == null) {

                closePanel(st, true);

            }

        }
@@ -909,7 +910,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 


        boolean res = st.menu.performIdentifierAction(id, flags);



        // Only close down the menu if we don't have an action bar keeping it open.

        if (mActionBar == null) {

            closePanel(st, true);

        }



        return res;

    }