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

Commit 115a6f4d authored by Yigit Boyar's avatar Yigit Boyar
Browse files

Multiple fixes in ScrollView and HorizontalScrollView 

* Fixes a bug in HSV where it was not using unspecified measurement hint
* Fixed a bug in SV where it was ignoring padding and margin when
specifying measurement hint.
* Fixes a bug in both where padding/margin were not taken into account
when re-mausing for fill viewport.
* Fixes a bug in both where the ViewGroup's padding was ignored when
measureChild is called.

Bug: 27602908
Change-Id: I15cb942e0fc2ef39c753ff35d36e1d007f4e05a8
parent 174b140d

core/java/android/widget/HorizontalScrollView.java

+30 −19
Original line number Diff line number Diff line
@@ -325,16 +325,24 @@ public class HorizontalScrollView extends FrameLayout { 


        if (getChildCount() > 0) {

            final View child = getChildAt(0);

            int width = getMeasuredWidth();

            if (child.getMeasuredWidth() < width) {

            final int widthPadding;

            final int heightPadding;

            final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();

            final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion;

            if (targetSdkVersion >= Build.VERSION_CODES.M) {

                widthPadding = mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin;

                heightPadding = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin;

            } else {

                widthPadding = mPaddingLeft + mPaddingRight;

                heightPadding = mPaddingTop + mPaddingBottom;

            }



                int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, mPaddingTop

                        + mPaddingBottom, lp.height);

                width -= mPaddingLeft;

                width -= mPaddingRight;

                int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY);



            int desiredWidth = getMeasuredWidth() - widthPadding;

            if (child.getMeasuredWidth() < desiredWidth) {

                final int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(

                        desiredWidth, MeasureSpec.EXACTLY);

                final int childHeightMeasureSpec = getChildMeasureSpec(

                        heightMeasureSpec, heightPadding, lp.height);

                child.measure(childWidthMeasureSpec, childHeightMeasureSpec);

            }

        }
@@ -1235,17 +1243,17 @@ public class HorizontalScrollView extends FrameLayout { 
    }



    @Override

    protected void measureChild(View child, int parentWidthMeasureSpec, int parentHeightMeasureSpec) {

    protected void measureChild(View child, int parentWidthMeasureSpec,

            int parentHeightMeasureSpec) {

        ViewGroup.LayoutParams lp = child.getLayoutParams();



        int childWidthMeasureSpec;

        int childHeightMeasureSpec;



        childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec, mPaddingTop

                + mPaddingBottom, lp.height);



        childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);

        final int horizontalPadding = mPaddingLeft + mPaddingRight;

        final int childWidthMeasureSpec = MeasureSpec.makeSafeMeasureSpec(

                Math.max(0, MeasureSpec.getSize(parentWidthMeasureSpec) - horizontalPadding),

                MeasureSpec.UNSPECIFIED);



        final int childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec,

                mPaddingTop + mPaddingBottom, lp.height);

        child.measure(childWidthMeasureSpec, childHeightMeasureSpec);

    }
@@ -1257,8 +1265,11 @@ public class HorizontalScrollView extends FrameLayout { 
        final int childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec,

                mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin

                        + heightUsed, lp.height);

        final int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(

                lp.leftMargin + lp.rightMargin, MeasureSpec.UNSPECIFIED);

        final int usedTotal = mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin +

                widthUsed;

        final int childWidthMeasureSpec = MeasureSpec.makeSafeMeasureSpec(

                Math.max(0, MeasureSpec.getSize(parentWidthMeasureSpec) - usedTotal),

                MeasureSpec.UNSPECIFIED);



        child.measure(childWidthMeasureSpec, childHeightMeasureSpec);

    }

core/java/android/widget/ScrollView.java

+21 −17
Original line number Diff line number Diff line
@@ -350,12 +350,10 @@ public class ScrollView extends FrameLayout { 


        if (getChildCount() > 0) {

            final View child = getChildAt(0);

            final int height = getMeasuredHeight();

            if (child.getMeasuredHeight() < height) {

            final int widthPadding;

            final int heightPadding;

                final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();

            final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion;

            final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();

            if (targetSdkVersion >= VERSION_CODES.M) {

                widthPadding = mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin;

                heightPadding = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin;
@@ -364,10 +362,12 @@ public class ScrollView extends FrameLayout { 
                heightPadding = mPaddingTop + mPaddingBottom;

            }



            final int desiredHeight = getMeasuredHeight() - heightPadding;

            if (child.getMeasuredHeight() < desiredHeight) {

                final int childWidthMeasureSpec = getChildMeasureSpec(

                        widthMeasureSpec, widthPadding, lp.width);

                final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(

                        height - heightPadding, MeasureSpec.EXACTLY);

                        desiredHeight, MeasureSpec.EXACTLY);

                child.measure(childWidthMeasureSpec, childHeightMeasureSpec);

            }

        }
@@ -1268,9 +1268,10 @@ public class ScrollView extends FrameLayout { 


        childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec, mPaddingLeft

                + mPaddingRight, lp.width);



        final int verticalPadding = mPaddingTop + mPaddingBottom;

        childHeightMeasureSpec = MeasureSpec.makeSafeMeasureSpec(

                MeasureSpec.getSize(parentHeightMeasureSpec), MeasureSpec.UNSPECIFIED);

                Math.max(0, MeasureSpec.getSize(parentHeightMeasureSpec) - verticalPadding),

                MeasureSpec.UNSPECIFIED);



        child.measure(childWidthMeasureSpec, childHeightMeasureSpec);

    }
@@ -1283,8 +1284,11 @@ public class ScrollView extends FrameLayout { 
        final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec,

                mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin

                        + widthUsed, lp.width);

        final int usedTotal = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin +

                heightUsed;

        final int childHeightMeasureSpec = MeasureSpec.makeSafeMeasureSpec(

                MeasureSpec.getSize(parentHeightMeasureSpec), MeasureSpec.UNSPECIFIED);

                Math.max(0, MeasureSpec.getSize(parentHeightMeasureSpec) - usedTotal),

                MeasureSpec.UNSPECIFIED);



        child.measure(childWidthMeasureSpec, childHeightMeasureSpec);

    }