diff options
| author | Adam Powell <adamp@google.com> | 2012-09-16 17:08:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-16 17:08:18 -0700 |
| commit | fa9fc5bc1525f65bf042f6e30c32a985cd12a04f (patch) | |
| tree | b04cdd6a855bba4cb2f63fed5491442cd0baef87 /core | |
| parent | b137c8065db941b23ab23f6550a1c65693039ff5 (diff) | |
| parent | 489f3451e2a59e19a67fbb28da2dcbd028fc77d1 (diff) | |
| download | frameworks_base-fa9fc5bc1525f65bf042f6e30c32a985cd12a04f.zip frameworks_base-fa9fc5bc1525f65bf042f6e30c32a985cd12a04f.tar.gz frameworks_base-fa9fc5bc1525f65bf042f6e30c32a985cd12a04f.tar.bz2 | |
Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/layout/alert_dialog_holo.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/res/res/layout/alert_dialog_holo.xml b/core/res/res/layout/alert_dialog_holo.xml index 7fc31d8..3f1fa3c 100644 --- a/core/res/res/layout/alert_dialog_holo.xml +++ b/core/res/res/layout/alert_dialog_holo.xml @@ -67,7 +67,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:orientation="vertical"> + android:orientation="vertical" + android:minHeight="64dp"> <ScrollView android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -86,7 +87,8 @@ <FrameLayout android:id="@+id/customPanel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1"> + android:layout_weight="1" + android:minHeight="64dp"> <FrameLayout android:id="@+android:id/custom" android:layout_width="match_parent" android:layout_height="wrap_content" /> |