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

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

Browse Source 
* commit '9b126882e61f2a1c3b0d1876c2bea3b38bbbafed':
  Fix Custom action mode menu item onclick is not working
This commit is contained in:
Clara Bayarri
2015-09-03 06:21:25 +00:00
committed by Android Git Automerger
parent 62e8020176 9b126882e6
commit 3b60f72fba
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( 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);