Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enforce a maximum size for action button icons." into jb-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2012-07-30 14:37:46 -07:00
committed by Android (Google) Code Review
parent 7267babae3 c0047d4e11
commit 859a62ce92
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/com/android/internal/view/menu/ActionMenuItemView.java
View File

@@ -48,6 +48,9 @@ public class ActionMenuItemView extends TextView
private int mMinWidth; private int mMinWidth;
private int mSavedPaddingLeft; private int mSavedPaddingLeft;
private static final int MAX_ICON_SIZE = 32; // dp
private int mMaxIconSize;
public ActionMenuItemView(Context context) { public ActionMenuItemView(Context context) {
this(context, null); this(context, null);
} }
@@ -67,6 +70,9 @@ public class ActionMenuItemView extends TextView
com.android.internal.R.styleable.ActionMenuItemView_minWidth, 0); com.android.internal.R.styleable.ActionMenuItemView_minWidth, 0);
a.recycle(); a.recycle();
final float density = res.getDisplayMetrics().density;
mMaxIconSize = (int) (MAX_ICON_SIZE * density + 0.5f);
setOnClickListener(this); setOnClickListener(this);
setOnLongClickListener(this); setOnLongClickListener(this);
@@ -135,7 +141,20 @@ public class ActionMenuItemView extends TextView
public void setIcon(Drawable icon) { public void setIcon(Drawable icon) {
mIcon = icon; mIcon = icon;
setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); int width = icon.getIntrinsicWidth();
int height = icon.getIntrinsicHeight();
if (width > mMaxIconSize) {
final float scale = (float) mMaxIconSize / width;
width = mMaxIconSize;
height *= scale;
}
if (height > mMaxIconSize) {
final float scale = (float) mMaxIconSize / height;
height = mMaxIconSize;
width *= scale;
}
icon.setBounds(0, 0, width, height);
setCompoundDrawables(icon, null, null, null);
updateTextButtonVisibility(); updateTextButtonVisibility();
} }
@@ -245,7 +264,7 @@ public class ActionMenuItemView extends TextView
// TextView won't center compound drawables in both dimensions without // TextView won't center compound drawables in both dimensions without
// a little coercion. Pad in to center the icon after we've measured. // a little coercion. Pad in to center the icon after we've measured.
final int w = getMeasuredWidth(); final int w = getMeasuredWidth();
final int dw = mIcon.getIntrinsicWidth(); final int dw = mIcon.getBounds().width();
super.setPadding((w - dw) / 2, getPaddingTop(), getPaddingRight(), getPaddingBottom()); super.setPadding((w - dw) / 2, getPaddingTop(), getPaddingRight(), getPaddingBottom());
} }
} }