diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-04-13 09:16:25 -0700 |
|---|---|---|
| committer | Filip Gruszczynski <gruszczy@google.com> | 2015-04-16 14:39:13 -0700 |
| commit | b6824bf58a0cd34395993fa204217e8e246de6fb (patch) | |
| tree | 764616aa3a6af3b41713629752126e123028983e /core/java/android/widget/LinearLayout.java | |
| parent | fb23c67e8a0083ee376ad3f0e98f97d06755eb57 (diff) | |
| download | frameworks_base-b6824bf58a0cd34395993fa204217e8e246de6fb.zip frameworks_base-b6824bf58a0cd34395993fa204217e8e246de6fb.tar.gz frameworks_base-b6824bf58a0cd34395993fa204217e8e246de6fb.tar.bz2 | |
Make UNSPECIFIED measure spec include size hint.
Change-Id: I6c4f193d0590824c644e20e8af16d055a04ac9c9
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index da15302..72f51c9 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -1058,8 +1058,11 @@ public class LinearLayout extends ViewGroup { // use as much space as it wants because we can shrink things // later (and re-measure). if (baselineAligned) { - final int freeSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); - child.measure(freeSpec, freeSpec); + final int freeWidthSpec = MeasureSpec.makeMeasureSpec( + MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.UNSPECIFIED); + final int freeHeightSpec = MeasureSpec.makeMeasureSpec( + MeasureSpec.getSize(heightMeasureSpec), MeasureSpec.UNSPECIFIED); + child.measure(freeWidthSpec, freeHeightSpec); } else { skippedMeasure = true; } |