Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9168f0b1 authored by Adam Powell's avatar Adam Powell
Browse files

Add ActionMode#getMenuInflater() for easier menu inflation in 

ActionMode.Callback implementations

Change-Id: If9e7ab0d65598bab537add6c6a452a55c093064f
parent 8fbe89d2

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -178779,6 +178779,17 @@ 
 visibility="public"

>

</method>

<method name="getMenuInflater"

 return="android.view.MenuInflater"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSubtitle"

 return="java.lang.CharSequence"

 abstract="true"

core/java/android/view/ActionMode.java

+5 −0
Original line number Diff line number Diff line
@@ -117,6 +117,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

core/java/com/android/internal/app/ActionBarImpl.java

+7 −1
Original line number Diff line number Diff line
@@ -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;
@@ -393,6 +394,11 @@ public class ActionBarImpl extends ActionBar { 
            mMenu.setCallback(this);

        }



        @Override

        public MenuInflater getMenuInflater() {

            return new MenuInflater(mActivity);

        }



        @Override

        public Menu getMenu() {

            return mMenu;

core/java/com/android/internal/view/StandaloneActionMode.java

+6 −0
Original line number Diff line number Diff line
@@ -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);

    }