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

am 4b941f00: Merge "Fix bug 6906134" into jb-mr1-dev

Browse Source 
* commit '4b941f00cd832663a42c8cf0ddb0f97365bfe252':
  Fix bug 6906134
This commit is contained in:
Adam Powell
2012-07-31 11:37:02 -07:00
committed by Android Git Automerger
parent 1b913c5c2a 4b941f00cd
commit 6cbfa6896e
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,19 +141,21 @@ public class ActionMenuItemView extends TextView
public void setIcon(Drawable icon) { public void setIcon(Drawable icon) {
mIcon = icon; mIcon = icon;
int width = icon.getIntrinsicWidth(); if (icon != null) {
int height = icon.getIntrinsicHeight(); int width = icon.getIntrinsicWidth();
if (width > mMaxIconSize) { int height = icon.getIntrinsicHeight();
final float scale = (float) mMaxIconSize / width; if (width > mMaxIconSize) {
width = mMaxIconSize; final float scale = (float) mMaxIconSize / width;
height *= scale; width = mMaxIconSize;
height *= scale;
}
if (height > mMaxIconSize) {
final float scale = (float) mMaxIconSize / height;
height = mMaxIconSize;
width *= scale;
}
icon.setBounds(0, 0, width, height);
} }
if (height > mMaxIconSize) {
final float scale = (float) mMaxIconSize / height;
height = mMaxIconSize;
width *= scale;
}
icon.setBounds(0, 0, width, height);
setCompoundDrawables(icon, null, null, null); setCompoundDrawables(icon, null, null, null);
updateTextButtonVisibility(); updateTextButtonVisibility();