Fix bug 2923440 - ActionMode buttons show as action by default

The MenuInflater returned by ActionModes will set the default
showAsAction value to "ifRoom" if not otherwise specified.

Change-Id: I86045dc4e877a97a3464a1a5f44d8d1e2120b086

1 files changed, 13 insertions, 2 deletions

diff --git a/core/java/android/view/MenuInflater.java b/core/java/android/view/MenuInflater.java
index a959e0d45e6e..43512740e099 100644
--- a/core/java/android/view/MenuInflater.java
+++ b/core/java/android/view/MenuInflater.java
@@ -53,14 +53,24 @@ public class MenuInflater {
     private static final int NO_ID = 0;
     
     private Context mContext;
-    
+
+    private int mDefaultShowAsAction;
+
     /**
      * Constructs a menu inflater.
      * 
      * @see Activity#getMenuInflater()
      */
     public MenuInflater(Context context) {
+        this(context, MenuItem.SHOW_AS_ACTION_NEVER);
+    }
+
+    /**
+     * @hide used internally to change the default showAsAction setting in action modes
+     */
+    public MenuInflater(Context context, int defaultShowAsAction) {
         mContext = context;
+        mDefaultShowAsAction = defaultShowAsAction;
     }
 
     /**
@@ -247,7 +257,7 @@ public class MenuInflater {
          * - 1: ifRoom
          * - 2: always
          */
-        private int itemShowAsAction = MenuItem.SHOW_AS_ACTION_NEVER;
+        private int itemShowAsAction;
         
         private String itemListenerMethodName;
         
@@ -262,6 +272,7 @@ public class MenuInflater {
         
         public MenuState(final Menu menu) {
             this.menu = menu;
+            this.itemShowAsAction = mDefaultShowAsAction;
             
             resetGroup();
         }