diff options
| author | Alan Viverette <alanv@google.com> | 2015-10-20 17:29:39 -0400 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-10-20 17:29:39 -0400 |
| commit | b5817779a9d918b9e0bee518d88a781fe7d811f4 (patch) | |
| tree | 52f7fb187e1983c2a6f01207cf305c4f5a0d2453 /core | |
| parent | 840f38905c073044077cb2bef68d20971f5d3d39 (diff) | |
| download | frameworks_base-b5817779a9d918b9e0bee518d88a781fe7d811f4.zip frameworks_base-b5817779a9d918b9e0bee518d88a781fe7d811f4.tar.gz frameworks_base-b5817779a9d918b9e0bee518d88a781fe7d811f4.tar.bz2 | |
DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
Bug: 22824701
Bug: 25107144
Change-Id: Ia0afd3edc20b8127605aef2653fa9b5472f41be2
(cherry picked from commit 130ce740d1aa4b9a7b024c76f8adec2c24278a81)
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 4dfa7db..abcd614 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -704,7 +704,7 @@ public class RelativeLayout extends ViewGroup { } final int heightMode; - if (params.width == LayoutParams.MATCH_PARENT) { + if (params.height == LayoutParams.MATCH_PARENT) { heightMode = MeasureSpec.EXACTLY; } else { heightMode = MeasureSpec.AT_MOST; |