Merge change I4a4323c0 into eclair-mr2

* changes: Fixes scroll/measure bug in EditText
2009-10-12 13:31:19 -04:00
parent 656c037c80 4a4323c08d
commit f555bf65e1
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@ -5198,7 +5198,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
            mDesiredHeightAtMeasure = desired;

            if (heightMode == MeasureSpec.AT_MOST) {
-                height = Math.min(desired, height);
+                height = Math.min(desired, heightSize);
            }
        }