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

Commit ec139240 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps... 

Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
parents ee0d8deb 6bf6eb7d

core/java/android/view/ViewGroup.java

+2 −0
Original line number Diff line number Diff line
@@ -4817,6 +4817,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            int parentWidthMeasureSpec, int widthUsed,

            int parentHeightMeasureSpec, int heightUsed) {

        final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();

        final int layoutDirection = getLayoutDirection();

        lp.resolveLayoutDirection(layoutDirection);



        final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec,

                mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin

core/java/android/widget/FrameLayout.java

+5 −0
Original line number Diff line number Diff line
@@ -304,11 +304,16 @@ public class FrameLayout extends ViewGroup { 
        int maxWidth = 0;

        int childState = 0;



        final int layoutDirection = getLayoutDirection();



        for (int i = 0; i < count; i++) {

            final View child = getChildAt(i);

            if (mMeasureAllChildren || child.getVisibility() != GONE) {

                measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0);

                // measureChildWithMargins() has triggered layout params resolution, so no need

                // to do it now

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



                maxWidth = Math.max(maxWidth,

                        child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin);

                maxHeight = Math.max(maxHeight,

core/java/android/widget/RelativeLayout.java

+3 −2
Original line number Diff line number Diff line
@@ -414,12 +414,15 @@ public class RelativeLayout extends ViewGroup { 
        final boolean isWrapContentWidth = widthMode != MeasureSpec.EXACTLY;

        final boolean isWrapContentHeight = heightMode != MeasureSpec.EXACTLY;



        final int layoutDirection = getLayoutDirection();



        View[] views = mSortedHorizontalChildren;

        int count = views.length;

        for (int i = 0; i < count; i++) {

            View child = views[i];

            if (child.getVisibility() != GONE) {

                LayoutParams params = (LayoutParams) child.getLayoutParams();

                params.resolveLayoutDirection(layoutDirection);



                applyHorizontalSizeRules(params, myWidth);

                measureChildHorizontal(child, params, myWidth, myHeight);
@@ -483,8 +486,6 @@ public class RelativeLayout extends ViewGroup { 
            }

        }



        final int layoutDirection = getLayoutDirection();



        if (isWrapContentWidth) {

            // Width already has left padding in it since it was calculated by looking at

            // the right of each child view

core/java/android/widget/ScrollView.java

+2 −0
Original line number Diff line number Diff line
@@ -329,11 +329,13 @@ public class ScrollView extends FrameLayout { 
            return;

        }



        final int layoutDirection = getLayoutDirection();

        if (getChildCount() > 0) {

            final View child = getChildAt(0);

            int height = getMeasuredHeight();

            if (child.getMeasuredHeight() < height) {

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

                lp.resolveLayoutDirection(layoutDirection);



                int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,

                        mPaddingLeft + mPaddingRight, lp.width);

core/java/android/widget/TableRow.java

+4 −1
Original line number Diff line number Diff line
@@ -192,7 +192,9 @@ public class TableRow extends LinearLayout { 
            int widthMeasureSpec, int totalWidth,

            int heightMeasureSpec, int totalHeight) {

        if (mConstrainedColumnWidths != null) {

            final int layoutDirection = getLayoutDirection();

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

            lp.resolveLayoutDirection(layoutDirection);



            int measureMode = MeasureSpec.EXACTLY;

            int columnWidth = 0;
@@ -226,7 +228,6 @@ public class TableRow extends LinearLayout { 
                final int childWidth = child.getMeasuredWidth();

                lp.mOffset[LayoutParams.LOCATION_NEXT] = columnWidth - childWidth;



                final int layoutDirection = getLayoutDirection();

                final int absoluteGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection);

                switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) {

                    case Gravity.LEFT:
@@ -292,11 +293,13 @@ public class TableRow extends LinearLayout { 
        }



        final int[] columnWidths = mColumnWidths;

        final int layoutDirection = getLayoutDirection();



        for (int i = 0; i < numColumns; i++) {

            final View child = getVirtualChildAt(i);

            if (child != null && child.getVisibility() != GONE) {

                final LayoutParams layoutParams = (LayoutParams) child.getLayoutParams();

                layoutParams.resolveLayoutDirection(layoutDirection);

                if (layoutParams.span == 1) {

                    int spec;

                    switch (layoutParams.width) {