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

Commit 25128b0b authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView... 

am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev
automerge: b00c4242

* commit 'b00c4242':
  Inflate ActionMode items against the ActionBarContextView theme
parents 060afd45 b00c4242

core/java/com/android/internal/app/WindowDecorActionBar.java

+3 −3
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ public class WindowDecorActionBar extends ActionBar implements 


        mOverlayLayout.setHideOnContentScrollEnabled(false);

        mContextView.killMode();

        ActionModeImpl mode = new ActionModeImpl(callback);

        ActionModeImpl mode = new ActionModeImpl(mContextView.getContext(), callback);

        if (mode.dispatchOnCreate()) {

            mode.invalidate();

            mContextView.initForMode(mode);
@@ -940,9 +940,9 @@ public class WindowDecorActionBar extends ActionBar implements 
        private MenuBuilder mMenu;

        private WeakReference<View> mCustomView;

        

        public ActionModeImpl(ActionMode.Callback callback) {

        public ActionModeImpl(Context context, ActionMode.Callback callback) {

            mCallback = callback;

            mMenu = new MenuBuilder(getThemedContext())

            mMenu = new MenuBuilder(context)

                    .setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

            mMenu.setCallback(this);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi 
        if (!mSplitActionBar) {

            menu.addMenuPresenter(mActionMenuPresenter, mPopupContext);

            mMenuView = (ActionMenuView) mActionMenuPresenter.getMenuView(this);

            mMenuView.setBackgroundDrawable(null);

            mMenuView.setBackground(null);

            addView(mMenuView, layoutParams);

        } else {

            // Allow full screen width in split mode.