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

Merge change 949 into donut

Browse Source 
* changes:
  Fixes external #2575 (http://code.google.com/p/android/issues/detail?id=2575). HorizontalScrollView was comparing the measured height of its child to its width.
This commit is contained in:
Android (Google) Code Review
2009-05-04 15:30:35 -07:00
parent beb2498ead f83f59f4af
commit 724561cc20
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/HorizontalScrollView.java
View File

@@ -283,7 +283,7 @@ public class HorizontalScrollView extends FrameLayout {
final View child = getChildAt(0); final View child = getChildAt(0);
int width = getMeasuredWidth(); int width = getMeasuredWidth();
if (child.getMeasuredHeight() < width) { if (child.getMeasuredWidth() < width) {
final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams(); final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();
int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, mPaddingTop int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, mPaddingTop