Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cc03076 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 724561cc: Merge change 949 into donut 

Merge commit '724561cc'

* commit '724561cc':
  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.
parents 0003a522 724561cc

core/java/android/widget/HorizontalScrollView.java

+1 −1
Original line number Diff line number Diff line
@@ -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