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

Commit fbc21e12 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

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

Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)

- fix LayoutParams resolution for LinearLayout only
- apply onResolveLayoutDirection() in both measureHorizontal() and
measureVertical()

Change-Id: I5fcded9a79cd9aaeb0e12da7fd14176b71ba2fb6
parent 64182d84

core/java/android/widget/LinearLayout.java

+6 −0
Original line number Diff line number Diff line
@@ -648,6 +648,8 @@ public class LinearLayout extends ViewGroup { 


        int largestChildHeight = Integer.MIN_VALUE;



        final int layoutDirection = getLayoutDirection();



        // See how tall everyone is. Also remember max width.

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

            final View child = getVirtualChildAt(i);
@@ -667,6 +669,7 @@ public class LinearLayout extends ViewGroup { 
            }



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

            lp.onResolveLayoutDirection(layoutDirection);



            totalWeight += lp.weight;
@@ -989,6 +992,8 @@ public class LinearLayout extends ViewGroup { 


        int largestChildWidth = Integer.MIN_VALUE;



        final int layoutDirection = getLayoutDirection();



        // See how wide everyone is. Also remember max height.

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

            final View child = getVirtualChildAt(i);
@@ -1009,6 +1014,7 @@ public class LinearLayout extends ViewGroup { 


            final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)

                    child.getLayoutParams();

            lp.onResolveLayoutDirection(layoutDirection);



            totalWeight += lp.weight;