diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-29 17:14:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 17:14:54 -0700 |
| commit | ea5e56ad9c2324dd6fbeab64e031878e03122c40 (patch) | |
| tree | 1793ce2e3afbaffb8fc2cb45ea63424fc4351eaa /core/java/android/widget/TableRow.java | |
| parent | 8e32da8ef024cf5dc423c5734ba93dae7ea8c8a3 (diff) | |
| parent | d31f0ab93f4f35a7ca6df6d428db2a5fd3d6750a (diff) | |
| download | frameworks_base-ea5e56ad9c2324dd6fbeab64e031878e03122c40.zip frameworks_base-ea5e56ad9c2324dd6fbeab64e031878e03122c40.tar.gz frameworks_base-ea5e56ad9c2324dd6fbeab64e031878e03122c40.tar.bz2 | |
am d31f0ab9: am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
* commit 'd31f0ab93f4f35a7ca6df6d428db2a5fd3d6750a':
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
Diffstat (limited to 'core/java/android/widget/TableRow.java')
| -rw-r--r-- | core/java/android/widget/TableRow.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java index a8cc406..fe3631a 100644 --- a/core/java/android/widget/TableRow.java +++ b/core/java/android/widget/TableRow.java @@ -192,9 +192,7 @@ 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; @@ -228,6 +226,7 @@ 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: @@ -293,13 +292,11 @@ 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) { |