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

Commit ee65e1d3 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 7573b1ee: Merge "Fix bug #7325234 LayoutParams are not resolved correctly... 

am 7573b1ee: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev

* commit '7573b1ee':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
parents 21973701 7573b1ee

core/java/android/widget/LinearLayout.java

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




        int largestChildHeight = Integer.MIN_VALUE;

        int largestChildHeight = Integer.MIN_VALUE;





        final int layoutDirection = getLayoutDirection();



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

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

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

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

            final View child = getVirtualChildAt(i);

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

            }





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

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

            lp.onResolveLayoutDirection(layoutDirection);





            totalWeight += lp.weight;

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




        int largestChildWidth = Integer.MIN_VALUE;

        int largestChildWidth = Integer.MIN_VALUE;





        final int layoutDirection = getLayoutDirection();



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

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

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

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

            final View child = getVirtualChildAt(i);

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




            final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)

            final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)

                    child.getLayoutParams();

                    child.getLayoutParams();

            lp.onResolveLayoutDirection(layoutDirection);





            totalWeight += lp.weight;

            totalWeight += lp.weight;