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/FrameLayout.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/FrameLayout.java')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 00cd60434e5c..45f30df7b40d 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -304,11 +304,16 @@ public class FrameLayout extends ViewGroup { int maxWidth = 0; int childState = 0; + final int layoutDirection = getLayoutDirection(); + for (int i = 0; i < count; i++) { final View child = getChildAt(i); if (mMeasureAllChildren || child.getVisibility() != GONE) { measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0); + // measureChildWithMargins() has triggered layout params resolution, so no need + // to do it now final LayoutParams lp = (LayoutParams) child.getLayoutParams(); + maxWidth = Math.max(maxWidth, child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin); maxHeight = Math.max(maxHeight, |