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

Author: adamp

core/java/android/widget/ImageView.java

@@ -789,6 +789,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                     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 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                     if (!done && resizeHeight) {
                         int newHeight = (int)((widthSize - pleft - pright) / desiredAspect) +
                                 ptop + pbottom;
+                        heightSize = resolveAdjustedSize(newHeight, mMaxHeight, heightMeasureSpec);
                         if (newHeight <= heightSize) {
                             heightSize = newHeight;
                         }