Merge "Make dialogs look better when their content is small."

core/java/com/android/internal/widget/WeightedLinearLayout.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.widget.LinearLayout;
+
+import static android.view.View.MeasureSpec.*;
+import static com.android.internal.R.*;
+
+/**
+ * A special layout when measured in AT_MOST will take up a given percentage of
+ * the available space.
+ */
+public class WeightedLinearLayout extends LinearLayout {
+    private float mMajorWeight;
+    private float mMinorWeight;
+
+    public WeightedLinearLayout(Context context) {
+        super(context);
+    }
+
+    public WeightedLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        
+        TypedArray a = 
+            context.obtainStyledAttributes(attrs, styleable.WeightedLinearLayout);
+
+        mMajorWeight = a.getFloat(styleable.WeightedLinearLayout_majorWeight, 0.0f);
+        mMinorWeight = a.getFloat(styleable.WeightedLinearLayout_minorWeight, 0.0f);
+        
+        a.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
+        final boolean isPortrait = metrics.widthPixels < metrics.heightPixels;
+
+        final int widthMode = getMode(widthMeasureSpec);
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        int width = getMeasuredWidth();
+        int height = getMeasuredHeight();
+        boolean measure = false;
+
+        final int widthSize = getSize(widthMeasureSpec);
+        widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, EXACTLY);
+        heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, EXACTLY);
+
+        final float widthWeight = isPortrait ? mMinorWeight : mMajorWeight;
+        if (widthMode == AT_MOST && widthWeight > 0.0f) {
+            if (width < (widthSize * widthWeight)) {
+                widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (widthSize * widthWeight),
+                        EXACTLY);
+                measure = true;
+            }
+        }
+
+        // TODO: Support height?
+
+        if (measure) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);            
+        }
+    }
+}

core/res/res/layout/alert_dialog.xml

@@ -18,7 +18,8 @@
 */
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.internal.widget.WeightedLinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/parentPanel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -27,7 +28,8 @@
     android:paddingBottom="3dip"
     android:paddingLeft="3dip"
     android:paddingRight="1dip"
-    >
+    android:majorWeight="0.5"
+    android:minorWeight="0.8">
 
     <LinearLayout android:id="@+id/topPanel"
         android:layout_width="match_parent"
@@ -143,4 +145,4 @@
                 android:visibility="gone" />
         </LinearLayout>
      </LinearLayout>
-</LinearLayout>
+</com.android.internal.widget.WeightedLinearLayout>

core/res/res/values/attrs.xml

@@ -2334,6 +2334,11 @@
         <attr name="orientation" />
     </declare-styleable>
 
+    <!-- @hide -->
+    <declare-styleable name="WeightedLinearLayout">
+        <attr name="majorWeight" format="float" />
+        <attr name="minorWeight" format="float" />
+    </declare-styleable>
 
     <!-- ========================= -->
     <!-- Drawable class attributes -->