Merge "Bring back buttons in dialogs. Bug #2390537"

2010-01-22 11:01:42 -08:00
parent 28d9c60ee2 cf635ae7c6
commit 2e61d7ca64
2 changed files with 165 additions and 2 deletions
--- 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) {