Merge "Make sure action bar context modes reserve space for overflow menus on all devices."

2 files changed, 8 insertions, 3 deletions

diff --git a/core/java/com/android/internal/view/menu/ActionMenuView.java b/core/java/com/android/internal/view/menu/ActionMenuView.java
index 7024a2748cd8..e2815368ecba 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuView.java
@@ -71,6 +71,10 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
         return mReserveOverflow;
     }
     
+    public void setOverflowReserved(boolean reserveOverflow) {
+        mReserveOverflow = reserveOverflow;
+    }
+
     @Override
     protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
         if (p instanceof LayoutParams) {
diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
index 3e49cf9a594d..de3162a84b20 100644
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -25,7 +25,6 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -53,7 +52,7 @@ public class ActionBarContextView extends ViewGroup {
     private TextView mTitleView;
     private TextView mSubtitleView;
     private Drawable mCloseDrawable;
-    private View mMenuView;
+    private ActionMenuView mMenuView;
     
     public ActionBarContextView(Context context) {
         this(context, null, 0);
@@ -150,7 +149,9 @@ public class ActionBarContextView extends ViewGroup {
         addView(mCloseButton);
 
         final MenuBuilder menu = (MenuBuilder) mode.getMenu();
-        mMenuView = menu.getMenuView(MenuBuilder.TYPE_ACTION_BUTTON, this);
+        mMenuView = (ActionMenuView) menu.getMenuView(MenuBuilder.TYPE_ACTION_BUTTON, this);
+        mMenuView.setOverflowReserved(true);
+        mMenuView.updateChildren(false);
         addView(mMenuView);
     }