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

Commit b1271ac1 authored by Adam Powell's avatar Adam Powell
Browse files

Fix adjustViewBounds handling for ImageView 

When computing the adjusted view bounds, don't constrain the
dimensions by the original estimate. This can result in the view never
getting properly enlarged.

Bug 72402519

Change-Id: I44fc017f8b661121f0042fcd59a4efde70be6bbe
parent 4368ba45

core/java/android/widget/ImageView.java

+2 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ 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;
@@ -799,6 +800,7 @@ 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;

                        }