commit 0d7ad0b89aeb8bafd4ccab0f5ccb71f89f415192
author Chris Banes <chrisbanes@google.com> Wed May 29 08:02:47 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 08:02:48 2013 +0000
tree 1c1805ff65be61bad765298b2e28aa8c548e3e83
parent 9578a5eeff2a628783622a97fdd9021613df3576
parent baf2251209e04f0dac4ec7e5d8c0bfc0014c4038

Merge "Fix Context MenuInflater is created with" into jb-mr2-dev

v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java

diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
index c53f1bb..c46f698 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
@@ -86,7 +86,12 @@
 
     MenuInflater getMenuInflater() {
         if (mMenuInflater == null) {
-            mMenuInflater = new SupportMenuInflater(mActivity);
+            ActionBar ab = getSupportActionBar();
+            if (ab != null) {
+                mMenuInflater = new SupportMenuInflater(ab.getThemedContext());
+            } else {
+                mMenuInflater = new SupportMenuInflater(mActivity);
+            }
         }
         return mMenuInflater;
     }