diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-29 01:10:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-29 01:10:09 +0000 |
| commit | 05b2fedcb8057f31ed078a59a8cffce131449df0 (patch) | |
| tree | 4b4f269e809a4717dd14141fdc7f8dc8c8d0b85c | |
| parent | c8787beca679ca593dda05bb151ebe4afdf441c8 (diff) | |
| parent | f6a36e9cf347a851bc3b717e4c39b484fce4e9c2 (diff) | |
| download | frameworks_base-05b2fedcb8057f31ed078a59a8cffce131449df0.zip frameworks_base-05b2fedcb8057f31ed078a59a8cffce131449df0.tar.gz frameworks_base-05b2fedcb8057f31ed078a59a8cffce131449df0.tar.bz2 | |
Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev
| -rw-r--r-- | core/java/com/android/internal/app/WindowDecorActionBar.java | 6 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarContextView.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/com/android/internal/app/WindowDecorActionBar.java b/core/java/com/android/internal/app/WindowDecorActionBar.java index 2377c22..785b303 100644 --- a/core/java/com/android/internal/app/WindowDecorActionBar.java +++ b/core/java/com/android/internal/app/WindowDecorActionBar.java @@ -496,7 +496,7 @@ public class WindowDecorActionBar extends ActionBar implements mOverlayLayout.setHideOnContentScrollEnabled(false); mContextView.killMode(); - ActionModeImpl mode = new ActionModeImpl(callback); + ActionModeImpl mode = new ActionModeImpl(mContextView.getContext(), callback); if (mode.dispatchOnCreate()) { mode.invalidate(); mContextView.initForMode(mode); @@ -940,9 +940,9 @@ public class WindowDecorActionBar extends ActionBar implements private MenuBuilder mMenu; private WeakReference<View> mCustomView; - public ActionModeImpl(ActionMode.Callback callback) { + public ActionModeImpl(Context context, ActionMode.Callback callback) { mCallback = callback; - mMenu = new MenuBuilder(getThemedContext()) + mMenu = new MenuBuilder(context) .setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); mMenu.setCallback(this); } diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java index 062a9b1..7c671e8 100644 --- a/core/java/com/android/internal/widget/ActionBarContextView.java +++ b/core/java/com/android/internal/widget/ActionBarContextView.java @@ -241,7 +241,7 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi if (!mSplitActionBar) { menu.addMenuPresenter(mActionMenuPresenter, mPopupContext); mMenuView = (ActionMenuView) mActionMenuPresenter.getMenuView(this); - mMenuView.setBackgroundDrawable(null); + mMenuView.setBackground(null); addView(mMenuView, layoutParams); } else { // Allow full screen width in split mode. |