commit 0b137c763b43b7e03a34206d07d6f465cfd49dff
author Alan Viverette <alanv@google.com> Wed Sep 10 03:52:10 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 10 03:52:10 2014 +0000
tree 38e5b0aaf5a35c1c85cce374e9a5653df9773069
parent 3af3ae2ee42ae14d25ba01ca6770f8aaa67622e3
parent cd7955f66c3b1c47b477ae197ec15c586cec784e

am a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev

* commit 'a9962d3609c2cf03ee7d437fcee2c339423da3c5':
  Improve dialog padding when title or body text are missing

core/res/res/layout/alert_dialog_material.xml

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" />

core/res/res/layout/alert_dialog_progress_material.xml

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"

core/res/res/layout/progress_dialog_material.xml

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"