From 68f3eb3b56fcdefa65b2a624af8eda3595f98beb Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 27 Sep 2012 21:05:17 -0700
Subject: [PATCH] Revert "Fix adjustViewBounds handling for ImageView"

This reverts commit b1271ac183c36d0e9e3a524bec8908ed5aab9a45

Revert this for now pending further investigation of bug 7248600

Change-Id: Ieb0a279fa2208f2aa575759dd6dd94476b471b8d
---
 core/java/android/widget/ImageView.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 7ca83223bee33..87396fbc13d07 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -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;
                         }