diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-10 15:30:28 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-10 18:38:23 -0700 |
| commit | 6bf6eb7d5f9207d6a3e1d6b61f17a8654d06fbdb (patch) | |
| tree | 9263b79d4b26aff11b551b0f762ec41e94175d6b /core/java/android/widget/RelativeLayout.java | |
| parent | f6215e55df1ab4f6cda33dd081c0a91062a1be63 (diff) | |
Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
Part 2
- fix remaining UI widgets by asking layout params resolution when needed
Change-Id: I97c41639da645d77eeda85feec3bbcc7fc1260b9
Diffstat (limited to 'core/java/android/widget/RelativeLayout.java')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 4ca405b4e84d..ace26f33584f 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -414,12 +414,15 @@ public class RelativeLayout extends ViewGroup { final boolean isWrapContentWidth = widthMode != MeasureSpec.EXACTLY; final boolean isWrapContentHeight = heightMode != MeasureSpec.EXACTLY; + final int layoutDirection = getLayoutDirection(); + View[] views = mSortedHorizontalChildren; int count = views.length; for (int i = 0; i < count; i++) { View child = views[i]; if (child.getVisibility() != GONE) { LayoutParams params = (LayoutParams) child.getLayoutParams(); + params.resolveLayoutDirection(layoutDirection); applyHorizontalSizeRules(params, myWidth); measureChildHorizontal(child, params, myWidth, myHeight); @@ -483,8 +486,6 @@ public class RelativeLayout extends ViewGroup { } } - final int layoutDirection = getLayoutDirection(); - if (isWrapContentWidth) { // Width already has left padding in it since it was calculated by looking at // the right of each child view |
