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

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

Merge "Revert "Fix adjustViewBounds handling for ImageView"" into jb-mr1-dev

parents 5735b1b5 68f3eb3b

core/java/android/widget/ImageView.java

+0 −2
Original line number Diff line number Diff line
@@ -789,7 +789,6 @@ public class ImageView extends View { 
                    if (resizeWidth) {

                        int newWidth = (int)(desiredAspect * (heightSize - ptop - pbottom)) +

                                pleft + pright;

                        widthSize = resolveAdjustedSize(newWidth, mMaxWidth, widthMeasureSpec);

                        if (newWidth <= widthSize) {

                            widthSize = newWidth;

                            done = true;
@@ -800,7 +799,6 @@ public class ImageView extends View { 
                    if (!done && resizeHeight) {

                        int newHeight = (int)((widthSize - pleft - pright) / desiredAspect) +

                                ptop + pbottom;

                        heightSize = resolveAdjustedSize(newHeight, mMaxHeight, heightMeasureSpec);

                        if (newHeight <= heightSize) {

                            heightSize = newHeight;

                        }