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

am 724561c: Merge change 949 into donut

Browse Source 
Merge commit '724561cc20e259888986cbb0be2fdab4d142d869'

* commit '724561cc20e259888986cbb0be2fdab4d142d869':
  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:32:39 -07:00
committed by The Android Open Source Project
parent 0003a522c1 724561cc20
commit 4cc03076c2
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);
int width = getMeasuredWidth();
if (child.getMeasuredHeight() < width) {
if (child.getMeasuredWidth() < width) {
final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();
int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, mPaddingTop