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

Commit 3abf5c4b authored by Alan Viverette's avatar Alan Viverette
Browse files

Use action mode context for ActionMode menu inflater 

BUG: 18078900
Change-Id: Iff837e741dde79a565f1e8c83846ee6155da179e
parent db41880d

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

+10 −7
Original line number Original line Diff line number Diff line
@@ -936,11 +936,14 @@ public class WindowDecorActionBar extends ActionBar implements 
     * @hide

     * @hide

     */

     */

    public class ActionModeImpl extends ActionMode implements MenuBuilder.Callback {

    public class ActionModeImpl extends ActionMode implements MenuBuilder.Callback {

        private final Context mActionModeContext;

        private final MenuBuilder mMenu;



        private ActionMode.Callback mCallback;

        private ActionMode.Callback mCallback;

        private MenuBuilder mMenu;

        private WeakReference<View> mCustomView;

        private WeakReference<View> mCustomView;





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

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

            mActionModeContext = context;

            mCallback = callback;

            mCallback = callback;

            mMenu = new MenuBuilder(context)

            mMenu = new MenuBuilder(context)

                    .setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

                    .setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -949,7 +952,7 @@ public class WindowDecorActionBar extends ActionBar implements 




        @Override

        @Override

        public MenuInflater getMenuInflater() {

        public MenuInflater getMenuInflater() {

            return new MenuInflater(getThemedContext());

            return new MenuInflater(mActionModeContext);

        }

        }





        @Override

        @Override