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

Commit 4e46d0fd authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #7649607 Hebrew text is cut off in Settings 

- in RTL mode and wrap content, make RelativeLayout respect the width that can be  passed to him

Change-Id: I6029135dede1ee80e41ae1bc2a337bf52cf24445
parent ae5b07ca

core/java/android/widget/RelativeLayout.java

+13 −3
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ public class RelativeLayout extends ViewGroup { 


        // We need to know our size for doing the correct computation of positioning in RTL mode

        if (isLayoutRtl() && (myWidth == -1 || isWrapContentWidth)) {

            myWidth = getPaddingStart() + getPaddingEnd();

            int w = getPaddingStart() + getPaddingEnd();

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

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

                View child = views[i];
@@ -436,8 +436,18 @@ public class RelativeLayout extends ViewGroup { 
                    }

                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);



                    myWidth += child.getMeasuredWidth();

                    myWidth += params.leftMargin + params.rightMargin;

                    w += child.getMeasuredWidth();

                    w += params.leftMargin + params.rightMargin;

                }

            }

            if (myWidth == -1) {

                // Easy case: "myWidth" was undefined before so use the width we have just computed

                myWidth = w;

            } else {

                // "myWidth" was defined before, so take the min of it and the computed width if it

                // is a non null one

                if (w > 0) {

                    myWidth = Math.min(myWidth, w);

                }

            }

        }