diff options
Diffstat (limited to 'core/java/android/widget/FrameLayout.java')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 7bae360..2bc6301 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -321,7 +321,7 @@ public class FrameLayout extends ViewGroup { mPaddingTop - mPaddingBottom - lp.topMargin - lp.bottomMargin, MeasureSpec.EXACTLY); } else { - childHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, + childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin, lp.height); } |