Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f555bf65: Merge change I4a4323c0 into eclair-mr2

Browse Source 
Merge commit 'f555bf65e18407314f569c1c767e5334cf3f56bf' into eclair-mr2-plus-aosp

* commit 'f555bf65e18407314f569c1c767e5334cf3f56bf':
  Fixes scroll/measure bug in EditText
This commit is contained in:
Christoffer Gurell
2009-10-12 11:20:56 -07:00
committed by Android Git Automerger
parent 5a6d521d9c f555bf65e1
commit 78077455a8
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;
if (heightMode == MeasureSpec.AT_MOST) {
height = Math.min(desired, height);
height = Math.min(desired, heightSize);
}
}