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

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

am 3a608f82: Merge change 5684 into donut 

Merge commit '3a608f82'

* commit '3a608f82':
  Fixes #1940605. MeasureSpec's mode and height were inverted in RelativeLayout.
parents e4b988b6 3a608f82

core/java/android/widget/RelativeLayout.java

+5 −3
Original line number Diff line number Diff line
@@ -558,9 +558,9 @@ public class RelativeLayout extends ViewGroup { 
                myWidth);

        int childHeightMeasureSpec;

        if (params.width == LayoutParams.FILL_PARENT) {

            childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.EXACTLY, myHeight);

            childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(myHeight, MeasureSpec.EXACTLY);

        } else {

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

            childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(myHeight, MeasureSpec.AT_MOST);

        }

        child.measure(childWidthMeasureSpec, childHeightMeasureSpec);

    }
@@ -1403,7 +1403,9 @@ public class RelativeLayout extends ViewGroup { 
            /*

             * START POOL IMPLEMENTATION

             */

            private static final int POOL_LIMIT = 12;

            // The pool is static, so all nodes instances are shared across

            // activities, that's why we give it a rather high limit

            private static final int POOL_LIMIT = 100;

            private static final Pool<Node> sPool = Pools.synchronizedPool(

                    Pools.finitePool(new PoolableManager<Node>() {

                        public Node newInstance() {