commit 04be4124dbed147c07fce4dfb6105755e0696dd5
author Chris Banes <chrisbanes@google.com> Thu Dec 19 09:40:45 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 19 09:41:02 2013 +0000
tree 1f843bfe973e7936f866068200d2f107b251376b
parent 313acd348f36f86f90209a4e15770374d96171b7
parent d48594f521469d15a9541972b5c5be7ba4afa4f3

Merge "Fix MenuInflater creation with no Action Bar" into klp-ub-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 67d36d0..798e359 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
@@ -95,12 +95,7 @@
 
     MenuInflater getMenuInflater() {
         if (mMenuInflater == null) {
-            ActionBar ab = getSupportActionBar();
-            if (ab != null) {
-                mMenuInflater = new SupportMenuInflater(ab.getThemedContext());
-            } else {
-                mMenuInflater = new SupportMenuInflater(mActivity);
-            }
+            mMenuInflater = new SupportMenuInflater(getActionBarThemedContext());
         }
         return mMenuInflater;
     }