diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-17 18:14:32 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-09-17 18:14:32 -0700 |
| commit | a9ddb8dc23b253c53f24ceb81e9d596c072d834e (patch) | |
| tree | 55665fbd1cf401b5f2b384680541f38b4ca7c73b /core/java/com | |
| parent | 80ea66b1029a72b031795cfcb2980558211a0f35 (diff) | |
| download | frameworks_base-a9ddb8dc23b253c53f24ceb81e9d596c072d834e.zip frameworks_base-a9ddb8dc23b253c53f24ceb81e9d596c072d834e.tar.gz frameworks_base-a9ddb8dc23b253c53f24ceb81e9d596c072d834e.tar.bz2 | |
Use action bar theme for action modes, fix ViewStub inflation theme
BUG: 17262483
BUG: 17513621
Change-Id: I74764570a11da162a224e94978e21e52d17e2e84
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/view/StandaloneActionMode.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/com/android/internal/view/StandaloneActionMode.java b/core/java/com/android/internal/view/StandaloneActionMode.java index fae7ea1..d5d3602 100644 --- a/core/java/com/android/internal/view/StandaloneActionMode.java +++ b/core/java/com/android/internal/view/StandaloneActionMode.java @@ -46,7 +46,8 @@ public class StandaloneActionMode extends ActionMode implements MenuBuilder.Call mContextView = view; mCallback = callback; - mMenu = new MenuBuilder(context).setDefaultShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + mMenu = new MenuBuilder(view.getContext()).setDefaultShowAsAction( + MenuItem.SHOW_AS_ACTION_IF_ROOM); mMenu.setCallback(this); mFocusable = isFocusable; } @@ -126,7 +127,7 @@ public class StandaloneActionMode extends ActionMode implements MenuBuilder.Call @Override public MenuInflater getMenuInflater() { - return new MenuInflater(mContext); + return new MenuInflater(mContextView.getContext()); } public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) { @@ -141,7 +142,7 @@ public class StandaloneActionMode extends ActionMode implements MenuBuilder.Call return true; } - new MenuPopupHelper(mContext, subMenu).show(); + new MenuPopupHelper(mContextView.getContext(), subMenu).show(); return true; } |