Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c38e0a2 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

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

parents 077490f5 cf70dcb0

core/java/android/widget/FrameLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }