Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a9962d3609c2cf03ee7d437fcee2c339423da3c5':
  Improve dialog padding when title or body text are missing
This commit is contained in:
Alan Viverette
2014-09-10 03:52:10 +00:00
committed by Android Git Automerger
parent 3af3ae2ee4 cd7955f66c
commit 0b137c763b
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/layout/alert_dialog_material.xml
View File

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

4
core/res/res/layout/alert_dialog_progress_material.xml
View File

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

6
core/res/res/layout/progress_dialog_material.xml
View File

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