summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-23 10:21:12 -0800
committerRomain Guy <romainguy@android.com>2010-01-23 10:21:12 -0800
commitff65c8c559941cac3f64ddaf350db318f3e993bb (patch)
treee4ec6d6a05d63c93e76f21b756834601045e1cb5
parent60e8495c1699f6f4d4046a3394b1eafdeefe6d64 (diff)
downloadframeworks_base-ff65c8c559941cac3f64ddaf350db318f3e993bb.zip
frameworks_base-ff65c8c559941cac3f64ddaf350db318f3e993bb.tar.gz
frameworks_base-ff65c8c559941cac3f64ddaf350db318f3e993bb.tar.bz2
Make vertical LinearLayouts behave like horizontal LLs do.
A bug fix in the horizontal handling of "useLargestChild" was not fixed in the vertical code.
-rw-r--r--core/java/android/widget/LinearLayout.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class LinearLayout extends ViewGroup {
i += getChildrenSkipCount(child, i);
}
- if (useLargestChild) {
+ if (useLargestChild && heightMode == MeasureSpec.AT_MOST) {
mTotalLength = 0;
for (int i = 0; i < count; ++i) {