summaryrefslogtreecommitdiff
path: root/core/java/android/widget/GridView.java
diff options
context:
space:
mode:
authorFilip Gruszczynski <gruszczy@google.com>2015-04-13 09:16:25 -0700
committerFilip Gruszczynski <gruszczy@google.com>2015-04-16 14:39:13 -0700
commitb6824bf58a0cd34395993fa204217e8e246de6fb (patch)
tree764616aa3a6af3b41713629752126e123028983e /core/java/android/widget/GridView.java
parentfb23c67e8a0083ee376ad3f0e98f97d06755eb57 (diff)
Make UNSPECIFIED measure spec include size hint.
Change-Id: I6c4f193d0590824c644e20e8af16d055a04ac9c9
Diffstat (limited to 'core/java/android/widget/GridView.java')
-rw-r--r--core/java/android/widget/GridView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index be0ca71907df..9ecdc9c35214 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1071,7 +1071,8 @@ public class GridView extends AbsListView {
p.forceAdd = true;
int childHeightSpec = getChildMeasureSpec(
- MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), 0, p.height);
+ MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(heightMeasureSpec),
+ MeasureSpec.UNSPECIFIED), 0, p.height);
int childWidthSpec = getChildMeasureSpec(
MeasureSpec.makeMeasureSpec(mColumnWidth, MeasureSpec.EXACTLY), 0, p.width);
child.measure(childWidthSpec, childHeightSpec);