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

Author: Fabrice Di Meglio

core/java/android/widget/LinearLayout.java

@@ -648,6 +648,8 @@ void measureVertical(int widthMeasureSpec, int heightMeasureSpec) {
 
         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 @@ void measureVertical(int widthMeasureSpec, int heightMeasureSpec) {
             }
 
             LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) child.getLayoutParams();
+            lp.onResolveLayoutDirection(layoutDirection);
 
             totalWeight += lp.weight;
 
@@ -989,6 +992,8 @@ void measureHorizontal(int widthMeasureSpec, int heightMeasureSpec) {
 
         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 @@ void measureHorizontal(int widthMeasureSpec, int heightMeasureSpec) {
 
             final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)
                     child.getLayoutParams();
+            lp.onResolveLayoutDirection(layoutDirection);
 
             totalWeight += lp.weight;