drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I4a4323c0 into eclair-mr2

Browse Source 
* changes:
  Fixes scroll/measure bug in EditText
This commit is contained in:
Android (Google) Code Review
2009-10-12 13:31:19 -04:00
parent 656c037c80 4a4323c08d
commit f555bf65e1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/TextView.java
View File

@ -5198,7 +5198,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mDesiredHeightAtMeasure = desired; mDesiredHeightAtMeasure = desired;
if (heightMode == MeasureSpec.AT_MOST) { if (heightMode == MeasureSpec.AT_MOST) {
height = Math.min(desired, height); height = Math.min(desired, heightSize);
} }
} }