Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev

Browse Source
This commit is contained in:
Clara Bayarri
2015-09-02 09:31:06 +00:00
committed by Android (Google) Code Review
parent 36a75d6aef ea2d644923
commit f7b220ab9f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/view/FloatingActionMode.java
View File

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