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

Commit 9b126882 authored by Clara Bayarri's avatar Clara Bayarri Committed by Android Git Automerger
Browse files

am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item... 

am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev

* commit '01232c50':
  Fix Custom action mode menu item onclick is not working
parents 9051eab5 01232c50

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

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

        mMenu = new MenuBuilder(context).setDefaultShowAsAction(

                MenuItem.SHOW_AS_ACTION_IF_ROOM);

                MenuItem.SHOW_AS_ACTION_IF_ROOM);

        setType(ActionMode.TYPE_FLOATING);

        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();

        mContentRect = new Rect();

        mContentRectOnScreen = new Rect();

        mContentRectOnScreen = new Rect();

        mPreviousContentRectOnScreen = new Rect();

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

                .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {

                        @Override

                        @Override

                    public boolean onMenuItemClick(MenuItem item) {

                    public boolean onMenuItemClick(MenuItem item) {

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

                        return mMenu.performItemAction(item, 0);

                    }

                    }

                });

                });

        mFloatingToolbarVisibilityHelper = new FloatingToolbarVisibilityHelper(mFloatingToolbar);

        mFloatingToolbarVisibilityHelper = new FloatingToolbarVisibilityHelper(mFloatingToolbar);