diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-26 16:27:55 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-26 17:13:33 -0700 |
| commit | bb4b601673a4f910d3e467bc5ce39538438859ce (patch) | |
| tree | 486cb529b62e7515e340dcb364ef4edcf7f315f8 /core/java/android/widget/FrameLayout.java | |
| parent | f704e9f67745d1f1c01058f4c74b06d157b4054d (diff) | |
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
This reverts commit 6bf6eb7d5f9207d6a3e1d6b61f17a8654d06fbdb.
and also fbc21e126f329b7b7c161858c1390ccb023be07e
I have also removed all unnecessary calls to resolveLayoutDirection(int). This is possible as
we are resolving layout params on every child of a ViewGroup as of commit
fcc3348f61b2992f0b84e8e8dcb3535fc715298f
Change-Id: I262a375b03fcc3c9261cbe2edebb6ec42ec2e186
Diffstat (limited to 'core/java/android/widget/FrameLayout.java')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index e15877640758..738f63bb9f4d 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -304,16 +304,11 @@ 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, |