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

Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-10-29 21:14:55 +00:00
committed by Android (Google) Code Review
parent 85d6f29994 3abf5c4bd1
commit d86d7bce78
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/app/WindowDecorActionBar.java
View File

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