| commit | 111d0367d75e0bba6558e4464a7662dc95825ba4 | [log] [tgz] |
|---|---|---|
| author | Wu-cheng Li <wuchengli@google.com> | Sun Jan 24 23:24:10 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Jan 24 23:24:10 2010 -0800 |
| tree | bed32393c104a296796ae56c4d822953d14f9eeb | |
| parent | ff65c8c559941cac3f64ddaf350db318f3e993bb [diff] | |
| parent | acf77033bbd4682566bcd3c535f4f1e94d23f962 [diff] |
Merge "Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency."
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 52a8679..b4e2790 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java
@@ -441,7 +441,7 @@ i += getChildrenSkipCount(child, i); } - if (useLargestChild) { + if (useLargestChild && heightMode == MeasureSpec.AT_MOST) { mTotalLength = 0; for (int i = 0; i < count; ++i) {