diff options
| author | Romain Guy <romainguy@google.com> | 2010-01-21 19:11:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-21 19:11:20 -0800 |
| commit | 177b580f56e91bc5519b8772e696b14f8b5757e2 (patch) | |
| tree | 9b87c87d65ffd94414cc72aef02e4afe07f069cc /core/res | |
| parent | 55f0c1fa24ffe5540f2756e2697feac7fbbbc357 (diff) | |
| parent | 5b1b2417106f161e4bc66296888f4685f213eebd (diff) | |
| download | frameworks_base-177b580f56e91bc5519b8772e696b14f8b5757e2.zip frameworks_base-177b580f56e91bc5519b8772e696b14f8b5757e2.tar.gz frameworks_base-177b580f56e91bc5519b8772e696b14f8b5757e2.tar.bz2 | |
Merge "Add a new attribute to LinearLayout: useLargestChild. Bug #2379138"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/alert_dialog.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/res/res/layout/alert_dialog.xml b/core/res/res/layout/alert_dialog.xml index 409dcd3..4a63c5b 100644 --- a/core/res/res/layout/alert_dialog.xml +++ b/core/res/res/layout/alert_dialog.xml @@ -109,7 +109,8 @@ android:orientation="horizontal" android:paddingTop="4dip" android:paddingLeft="2dip" - android:paddingRight="2dip" > + android:paddingRight="2dip" + android:useLargestChild="true"> <LinearLayout android:id="@+id/leftSpacer" android:layout_weight="0.25" android:layout_width="0dip" diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 8dadd88..140ab09 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1700,6 +1700,10 @@ space by giving it a layout_weight of 0.5 and setting the weightSum to 1.0. --> <attr name="weightSum" format="float" /> + <!-- When set to true, all children with a weight will be considered having + the minimum size of the largest child. If false, all children are + measured normally. --> + <attr name="useLargestChild" format="boolean" /> </declare-styleable> <declare-styleable name="ListView"> <!-- Reference to an array resource that will populate the ListView. For static content, |