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

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

Merge "Fix a couple interactions between action bar and options menus"

parents b86c89c1 8d12e201

core/java/com/android/internal/widget/ActionBarView.java

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.view.Menu; 
import android.view.View;

import android.view.ViewGroup;

import android.view.ViewParent;

import android.view.Window;

import android.widget.AdapterView;

import android.widget.HorizontalScrollView;

import android.widget.ImageView;
@@ -219,7 +220,7 @@ public class ActionBarView extends ViewGroup { 
            Context context = getContext();

            if (context instanceof Activity) {

              Activity activity = (Activity) context;

              activity.onOptionsItemSelected(mLogoNavItem);

              activity.onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, mLogoNavItem);

            }

          }

        });

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

+2 −0
Original line number Diff line number Diff line
@@ -411,6 +411,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
    public final void openPanel(int featureId, KeyEvent event) {

        if (featureId == FEATURE_OPTIONS_PANEL && mActionBar != null &&

                mActionBar.isOverflowReserved()) {

            // Invalidate the options menu, we want a prepare event that the app can respond to.

            invalidatePanelMenu(FEATURE_OPTIONS_PANEL);

            mActionBar.showOverflowMenu();

        } else {

            openPanel(getPanelState(featureId, true), event);