Merge change 949 into donut
* 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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user