diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-10 01:27:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 01:27:57 +0000 |
| commit | cd7955f66c3b1c47b477ae197ec15c586cec784e (patch) | |
| tree | 504f2fe89c4e1237dfb8929f8822ba8cac8258c7 /core/res | |
| parent | 0fd9d8a2c8494be0a6e2c327beca385be00a7a86 (diff) | |
| parent | e809b11bc10941e829f96e703c6bb3ddb7948a41 (diff) | |
| download | frameworks_base-cd7955f66c3b1c47b477ae197ec15c586cec784e.zip frameworks_base-cd7955f66c3b1c47b477ae197ec15c586cec784e.tar.gz frameworks_base-cd7955f66c3b1c47b477ae197ec15c586cec784e.tar.bz2 | |
Merge "Improve dialog padding when title or body text are missing" into lmp-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/alert_dialog_material.xml | 8 | ||||
| -rw-r--r-- | core/res/res/layout/alert_dialog_progress_material.xml | 4 | ||||
| -rw-r--r-- | core/res/res/layout/progress_dialog_material.xml | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/core/res/res/layout/alert_dialog_material.xml b/core/res/res/layout/alert_dialog_material.xml index 831ee98..be89e41 100644 --- a/core/res/res/layout/alert_dialog_material.xml +++ b/core/res/res/layout/alert_dialog_material.xml @@ -33,8 +33,7 @@ android:gravity="center_vertical|start" android:paddingStart="@dimen/alert_dialog_padding_material" android:paddingEnd="@dimen/alert_dialog_padding_material" - android:paddingTop="@dimen/alert_dialog_padding_top_material" - android:paddingBottom="12dip"> + android:paddingTop="@dimen/alert_dialog_padding_top_material"> <ImageView android:id="@+id/icon" android:layout_width="32dip" android:layout_height="32dip" @@ -57,7 +56,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:minHeight="64dp"> + android:minHeight="64dp" + android:paddingTop="@dimen/alert_dialog_padding_top_material"> <ScrollView android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -75,7 +75,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:minHeight="48dp"> + android:minHeight="64dp"> <FrameLayout android:id="@+id/custom" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/alert_dialog_progress_material.xml b/core/res/res/layout/alert_dialog_progress_material.xml index bcf946f..d005a44 100644 --- a/core/res/res/layout/alert_dialog_progress_material.xml +++ b/core/res/res/layout/alert_dialog_progress_material.xml @@ -19,7 +19,9 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingStart="@dimen/alert_dialog_padding_material" - android:paddingEnd="@dimen/alert_dialog_padding_material"> + android:paddingTop="@dimen/alert_dialog_padding_top_material" + android:paddingEnd="@dimen/alert_dialog_padding_material" + android:paddingBottom="@dimen/alert_dialog_padding_top_material"> <ProgressBar android:id="@+id/progress" style="?attr/progressBarStyleHorizontal" diff --git a/core/res/res/layout/progress_dialog_material.xml b/core/res/res/layout/progress_dialog_material.xml index c6eb1f9..54af106 100644 --- a/core/res/res/layout/progress_dialog_material.xml +++ b/core/res/res/layout/progress_dialog_material.xml @@ -26,7 +26,9 @@ android:layout_height="match_parent" android:baselineAligned="false" android:paddingStart="@dimen/alert_dialog_padding_material" - android:paddingEnd="@dimen/alert_dialog_padding_material"> + android:paddingTop="@dimen/alert_dialog_padding_top_material" + android:paddingEnd="@dimen/alert_dialog_padding_material" + android:paddingBottom="@dimen/alert_dialog_padding_top_material"> <ProgressBar android:id="@id/progress" @@ -34,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:max="10000" - android:layout_marginEnd="16dp" /> + android:layout_marginEnd="@dimen/alert_dialog_padding_material" /> <TextView android:id="@+id/message" |