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

am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev

Browse Source 
* commit '05b2fedcb8057f31ed078a59a8cffce131449df0':
  Inflate ActionMode items against the ActionBarContextView theme
This commit is contained in:
Alan Viverette
2014-10-29 22:48:52 +00:00
committed by Android Git Automerger
parent 47fa171522 05b2fedcb8
commit b00c424257
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,7 +496,7 @@ public class WindowDecorActionBar extends ActionBar implements
mOverlayLayout.setHideOnContentScrollEnabled(false); mOverlayLayout.setHideOnContentScrollEnabled(false);
mContextView.killMode(); mContextView.killMode();
ActionModeImpl mode = new ActionModeImpl(callback); ActionModeImpl mode = new ActionModeImpl(mContextView.getContext(), callback);
if (mode.dispatchOnCreate()) { if (mode.dispatchOnCreate()) {
mode.invalidate(); mode.invalidate();
mContextView.initForMode(mode); mContextView.initForMode(mode);
@@ -940,9 +940,9 @@ public class WindowDecorActionBar extends ActionBar implements
private MenuBuilder mMenu; private MenuBuilder mMenu;
private WeakReference<View> mCustomView; private WeakReference<View> mCustomView;
public ActionModeImpl(ActionMode.Callback callback) { public ActionModeImpl(Context context, ActionMode.Callback callback) {
mCallback = callback; mCallback = callback;
mMenu = new MenuBuilder(getThemedContext()) mMenu = new MenuBuilder(context)
.setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
mMenu.setCallback(this); mMenu.setCallback(this);
} }

2
core/java/com/android/internal/widget/ActionBarContextView.java
View File

@@ -241,7 +241,7 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi
if (!mSplitActionBar) { if (!mSplitActionBar) {
menu.addMenuPresenter(mActionMenuPresenter, mPopupContext); menu.addMenuPresenter(mActionMenuPresenter, mPopupContext);
mMenuView = (ActionMenuView) mActionMenuPresenter.getMenuView(this); mMenuView = (ActionMenuView) mActionMenuPresenter.getMenuView(this);
mMenuView.setBackgroundDrawable(null); mMenuView.setBackground(null);
addView(mMenuView, layoutParams); addView(mMenuView, layoutParams);
} else { } else {
// Allow full screen width in split mode. // Allow full screen width in split mode.