Merge "Fix typo bug in FrameLayout's measurement code. Bug #3327185" into honeycomb

2011-01-07 11:00:20 -08:00
parent 077490f567 cf70dcb0f7
commit 3c38e0a2a6
1 changed files with 1 additions and 1 deletions
--- 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);
                }