Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b941f00 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 6906134" into jb-mr1-dev

parents 9f52da21 c1eea136

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

+14 −12
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ public class ActionMenuItemView extends TextView 


    public void setIcon(Drawable icon) {

        mIcon = icon;

        if (icon != null) {

            int width = icon.getIntrinsicWidth();

            int height = icon.getIntrinsicHeight();

            if (width > mMaxIconSize) {
@@ -154,6 +155,7 @@ public class ActionMenuItemView extends TextView 
                width *= scale;

            }

            icon.setBounds(0, 0, width, height);

        }

        setCompoundDrawables(icon, null, null, null);



        updateTextButtonVisibility();