Add ActionMode#getMenuInflater() for easier menu inflation in

ActionMode.Callback implementations

Change-Id: If9e7ab0d65598bab537add6c6a452a55c093064f

3 files changed, 18 insertions, 1 deletions

diff --git a/core/java/android/view/ActionMode.java b/core/java/android/view/ActionMode.java
index 4a7d7ad..bfafa98 100644
--- a/core/java/android/view/ActionMode.java
+++ b/core/java/android/view/ActionMode.java
@@ -118,6 +118,11 @@ public abstract class ActionMode {
     public abstract View getCustomView();
 
     /**
+     * Returns a {@link MenuInflater} with the ActionMode's context.
+     */
+    public abstract MenuInflater getMenuInflater();
+
+    /**
      * Callback interface for action modes. Supplied to
      * {@link View#startActionMode(Callback)}, a Callback
      * configures and handles events raised by a user's interaction with an action mode.
diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index 0860bfe..281f32c 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -30,6 +30,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.ActionMode;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -392,7 +393,12 @@ public class ActionBarImpl extends ActionBar {
             mMenu = new MenuBuilder(mActionView.getContext());
             mMenu.setCallback(this);
         }
-        
+
+        @Override
+        public MenuInflater getMenuInflater() {
+            return new MenuInflater(mActivity);
+        }
+
         @Override
         public Menu getMenu() {
             return mMenu;
diff --git a/core/java/com/android/internal/view/StandaloneActionMode.java b/core/java/com/android/internal/view/StandaloneActionMode.java
index d8fd364..e6d6ba0 100644
--- a/core/java/com/android/internal/view/StandaloneActionMode.java
+++ b/core/java/com/android/internal/view/StandaloneActionMode.java
@@ -23,6 +23,7 @@ import com.android.internal.widget.ActionBarContextView;
 import android.content.Context;
 import android.view.ActionMode;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -109,6 +110,11 @@ public class StandaloneActionMode extends ActionMode implements MenuBuilder.Call
         return mCustomView != null ? mCustomView.get() : null;
     }
 
+    @Override
+    public MenuInflater getMenuInflater() {
+        return new MenuInflater(mContext);
+    }
+
     public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
         return mCallback.onActionItemClicked(this, item);
     }