Merge "Limit item heights in split action bars" into jb-dev

Author: adamp

core/java/com/android/internal/view/menu/ActionMenuItemView.java

@@ -70,8 +70,13 @@ public ActionMenuItemView(Context context, AttributeSet attrs, int defStyle) {
         setOnClickListener(this);
         setOnLongClickListener(this);
 
-        // Save the inflated padding for later, we'll need it.
-        mSavedPaddingLeft = getPaddingLeft();
+        mSavedPaddingLeft = -1;
+    }
+
+    @Override
+    public void setPadding(int l, int t, int r, int b) {
+        mSavedPaddingLeft = l;
+        super.setPadding(l, t, r, b);
     }
 
     public MenuItemImpl getItemData() {
@@ -217,8 +222,9 @@ public boolean onLongClick(View v) {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         final boolean textVisible = hasText();
-        if (textVisible) {
-            setPadding(mSavedPaddingLeft, getPaddingTop(), getPaddingRight(), getPaddingBottom());
+        if (textVisible && mSavedPaddingLeft >= 0) {
+            super.setPadding(mSavedPaddingLeft, getPaddingTop(),
+                    getPaddingRight(), getPaddingBottom());
         }
 
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -240,7 +246,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             // a little coercion. Pad in to center the icon after we've measured.
             final int w = getMeasuredWidth();
             final int dw = mIcon.getIntrinsicWidth();
-            setPadding((w - dw) / 2, getPaddingTop(), getPaddingRight(), getPaddingBottom());
+            super.setPadding((w - dw) / 2, getPaddingTop(), getPaddingRight(), getPaddingBottom());
         }
     }
 }

core/java/com/android/internal/view/menu/ActionMenuView.java

@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
@@ -25,6 +26,8 @@
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.LinearLayout;
 
+import com.android.internal.R;
+
 /**
  * @hide
  */
@@ -43,6 +46,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
     private int mMinCellSize;
     private int mGeneratedItemPadding;
     private int mMeasuredExtraWidth;
+    private int mMaxItemHeight;
 
     public ActionMenuView(Context context) {
         this(context, null);
@@ -54,6 +58,11 @@ public ActionMenuView(Context context, AttributeSet attrs) {
         final float density = context.getResources().getDisplayMetrics().density;
         mMinCellSize = (int) (MIN_CELL_SIZE * density);
         mGeneratedItemPadding = (int) (GENERATED_ITEM_PADDING * density);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ActionBar,
+                R.attr.actionBarStyle, 0);
+        mMaxItemHeight = a.getDimensionPixelSize(R.styleable.ActionBar_height, 0);
+        a.recycle();
     }
 
     public void setPresenter(ActionMenuPresenter presenter) {
@@ -116,6 +125,11 @@ private void onMeasureExactFormat(int widthMeasureSpec, int heightMeasureSpec) {
         final int widthPadding = getPaddingLeft() + getPaddingRight();
         final int heightPadding = getPaddingTop() + getPaddingBottom();
 
+        final int itemHeightSpec = heightMode == MeasureSpec.EXACTLY
+                ? MeasureSpec.makeMeasureSpec(heightSize - heightPadding, MeasureSpec.EXACTLY)
+                : MeasureSpec.makeMeasureSpec(
+                    Math.min(mMaxItemHeight, heightSize - heightPadding), MeasureSpec.AT_MOST);
+
         widthSize -= widthPadding;
 
         // Divide the view into cells.
@@ -167,7 +181,7 @@ private void onMeasureExactFormat(int widthMeasureSpec, int heightMeasureSpec) {
             final int cellsAvailable = lp.isOverflowButton ? 1 : cellsRemaining;
 
             final int cellsUsed = measureChildForCells(child, cellSize, cellsAvailable,
-                    heightMeasureSpec, heightPadding);
+                    itemHeightSpec, heightPadding);
 
             maxCellsUsed = Math.max(maxCellsUsed, cellsUsed);
             if (lp.expandable) expandableItemCount++;
@@ -298,15 +312,15 @@ private void onMeasureExactFormat(int widthMeasureSpec, int heightMeasureSpec) {
 
         // Remeasure any items that have had extra space allocated to them.
         if (needsExpansion) {
-            int heightSpec = MeasureSpec.makeMeasureSpec(heightSize - heightPadding, heightMode);
             for (int i = 0; i < childCount; i++) {
                 final View child = getChildAt(i);
                 final LayoutParams lp = (LayoutParams) child.getLayoutParams();
 
                 if (!lp.expanded) continue;
 
                 final int width = lp.cellsUsed * cellSize + lp.extraPixels;
-                child.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), heightSpec);
+                child.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                        itemHeightSpec);
             }
         }