diff options
| author | Romain Guy <romainguy@google.com> | 2010-01-22 11:01:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-22 11:01:42 -0800 |
| commit | 2e61d7ca64639ae842a16639975202fd4ad2f4be (patch) | |
| tree | d80aa39581da5b082a7abcd7156999e5aaddda03 /core/java/android/widget | |
| parent | 28d9c60ee203eff53a5a8577df8a780402173b24 (diff) | |
| parent | cf635ae7c65de34f62a41cd330f25f4ee9ddc95b (diff) | |
Merge "Bring back buttons in dialogs. Bug #2390537"
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 5c78af51e136..52a8679757ab 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -754,7 +754,7 @@ public class LinearLayout extends ViewGroup { maxHeight = Math.max(maxHeight, ascent + descent); } - if (useLargestChild) { + if (useLargestChild && widthMode == MeasureSpec.AT_MOST) { mTotalLength = 0; for (int i = 0; i < count; ++i) { |