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

Commit cf653223 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 3c38e0a2: Merge "Fix typo bug in FrameLayout\'s measurement code. Bug #3327185" into honeycomb 

* commit '3c38e0a2':
  Fix typo bug in FrameLayout's measurement code. Bug #3327185
parents 97afc5e0 3c38e0a2

core/java/android/widget/FrameLayout.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -321,7 +321,7 @@ public class FrameLayout extends ViewGroup { 
                            mPaddingTop - mPaddingBottom - lp.topMargin - lp.bottomMargin,

                            mPaddingTop - mPaddingBottom - lp.topMargin - lp.bottomMargin,

                            MeasureSpec.EXACTLY);

                            MeasureSpec.EXACTLY);

                } else {

                } else {

                    childHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec,

                    childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,

                            mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin,

                            mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin,

                            lp.height);

                            lp.height);

                }

                }