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

Commit dbba7466 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 26c0c772: Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to... 

am 26c0c772: Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb

* commit '26c0c772':
  Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change
parents ae621e19 26c0c772

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

+0 −11
Original line number Original line Diff line number Diff line
@@ -187,17 +187,6 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo 
            final MenuItemImpl itemData = itemsToShow.get(i);

            final MenuItemImpl itemData = itemsToShow.get(i);

            View actionView = itemData.getActionView();

            View actionView = itemData.getActionView();





            if (actionView == null) {

                // Check for a layout ID instead

                final int layoutId = itemData.getActionViewId();

                if (layoutId != 0) {

                    LayoutInflater inflater = LayoutInflater.from(getContext());

                    actionView = inflater.inflate(layoutId, this, false);

                    itemData.setActionView(0);

                    itemData.setActionView(actionView);

                }

            }



            if (actionView != null) {

            if (actionView != null) {

                final ViewParent parent = actionView.getParent();

                final ViewParent parent = actionView.getParent();

                if (parent instanceof ViewGroup) {

                if (parent instanceof ViewGroup) {

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

+3 −6
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ public final class MenuItemImpl implements MenuItem { 
    private int mShowAsAction = SHOW_AS_ACTION_NEVER;

    private int mShowAsAction = SHOW_AS_ACTION_NEVER;





    private View mActionView;

    private View mActionView;

    private int mActionViewId;





    /** Used for the icon resource ID if this item does not have an icon */

    /** Used for the icon resource ID if this item does not have an icon */

    static final int NO_ICON = 0;

    static final int NO_ICON = 0;
@@ -696,15 +695,13 @@ public final class MenuItemImpl implements MenuItem { 
    }

    }





    public MenuItem setActionView(int resId) {

    public MenuItem setActionView(int resId) {

        mActionViewId = resId;

        LayoutInflater inflater = LayoutInflater.from(mMenu.getContext());

        ViewGroup parent = (ViewGroup) mMenu.getMenuView(MenuBuilder.TYPE_ACTION_BUTTON, null);

        setActionView(inflater.inflate(resId, parent, false));

        return this;

        return this;

    }

    }





    public View getActionView() {

    public View getActionView() {

        return mActionView;

        return mActionView;

    }

    }



    public int getActionViewId() {

        return mActionViewId;

    }

}
 
}