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

Commit b2449a39 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev

* commit 'd86d7bce':
  Use action mode context for ActionMode menu inflater
parents 0904509f d86d7bce
Loading
Loading
Loading
Loading
+10 −7
Original line number Diff line number Diff line
@@ -936,11 +936,14 @@ public class WindowDecorActionBar extends ActionBar implements
     * @hide
     */
    public class ActionModeImpl extends ActionMode implements MenuBuilder.Callback {
        private final Context mActionModeContext;
        private final MenuBuilder mMenu;

        private ActionMode.Callback mCallback;
        private MenuBuilder mMenu;
        private WeakReference<View> mCustomView;

        public ActionModeImpl(Context context, ActionMode.Callback callback) {
            mActionModeContext = context;
            mCallback = callback;
            mMenu = new MenuBuilder(context)
                    .setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -949,7 +952,7 @@ public class WindowDecorActionBar extends ActionBar implements

        @Override
        public MenuInflater getMenuInflater() {
            return new MenuInflater(getThemedContext());
            return new MenuInflater(mActionModeContext);
        }

        @Override