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

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

Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev

parents cdee9727 5c8f9b50

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

+7 −0
Original line number Diff line number Diff line
@@ -989,6 +989,13 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            final Callback cb = getCallback();

            if (!mActionBar.isOverflowMenuShowing() || !toggleMenuMode) {

                if (cb != null && !isDestroyed() && mActionBar.getVisibility() == View.VISIBLE) {

                    // If we have a menu invalidation pending, do it now.

                    if (mInvalidatePanelMenuPosted &&

                            (mInvalidatePanelMenuFeatures & (1 << FEATURE_OPTIONS_PANEL)) != 0) {

                        mDecor.removeCallbacks(mInvalidatePanelMenuRunnable);

                        mInvalidatePanelMenuRunnable.run();

                    }



                    final PanelFeatureState st = getPanelState(FEATURE_OPTIONS_PANEL, true);



                    // If we don't have a menu or we're waiting for a full content refresh,