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

Commit 1e821959 authored by Clara Bayarri's avatar Clara Bayarri Committed by The Android Automerger
Browse files

Fix Custom action mode menu item onclick is not working 

BUG: 23575152
Change-Id: I7c07a769bd03c2d756e04f16296f418e965a993f
parent fc46bc2d

core/java/com/android/internal/view/FloatingActionMode.java

+10 −1
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ public class FloatingActionMode extends ActionMode { 
        mMenu = new MenuBuilder(context).setDefaultShowAsAction(

                MenuItem.SHOW_AS_ACTION_IF_ROOM);

        setType(ActionMode.TYPE_FLOATING);

        mMenu.setCallback(new MenuBuilder.Callback() {

            @Override

            public void onMenuModeChange(MenuBuilder menu) {}



            @Override

            public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {

                return mCallback.onActionItemClicked(FloatingActionMode.this, item);

            }

        });

        mContentRect = new Rect();

        mContentRectOnScreen = new Rect();

        mPreviousContentRectOnScreen = new Rect();
@@ -99,7 +108,7 @@ public class FloatingActionMode extends ActionMode { 
                .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {

                        @Override

                    public boolean onMenuItemClick(MenuItem item) {

                        return mCallback.onActionItemClicked(FloatingActionMode.this, item);

                        return mMenu.performItemAction(item, 0);

                    }

                });

        mFloatingToolbarVisibilityHelper = new FloatingToolbarVisibilityHelper(mFloatingToolbar);