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

Commit 7a5f7ec2 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

* commit 'ae268392':
  Revert "Fix adjustViewBounds handling for ImageView"
parents 610f5b3d ae268392

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;

                        }