diff options
| author | Romain Guy <romainguy@google.com> | 2011-01-07 11:03:20 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2011-01-07 11:03:20 -0800 |
| commit | cf70dcb0f76d1175f1d3c31da1c827eb443a323a (patch) | |
| tree | d4f5f4b600e90db7af4a557b4741a4fb60693228 /core/java/android/widget/FrameLayout.java | |
| parent | 171c592f0b7066acf279863c8a52ddabea49d3db (diff) | |
| download | frameworks_base-cf70dcb0f76d1175f1d3c31da1c827eb443a323a.zip frameworks_base-cf70dcb0f76d1175f1d3c31da1c827eb443a323a.tar.gz frameworks_base-cf70dcb0f76d1175f1d3c31da1c827eb443a323a.tar.bz2 | |
Fix typo bug in FrameLayout's measurement code.
Bug #3327185
Change-Id: If9a897efd8766b158749d053dabee3477bf1b053
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); } |