diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-29 19:21:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-29 19:21:22 +0000 |
| commit | 1e6775ebb41ff2b343569c9d21c006fed26d08b3 (patch) | |
| tree | cc531659443529c733047742d632950ef238c601 | |
| parent | 0824da26b4b1311cb594c08bb0e298b7facc1557 (diff) | |
| parent | c8241c12c4fb81a0190a2f4ad589170f5e66a3b6 (diff) | |
| download | frameworks_base-1e6775ebb41ff2b343569c9d21c006fed26d08b3.zip frameworks_base-1e6775ebb41ff2b343569c9d21c006fed26d08b3.tar.gz frameworks_base-1e6775ebb41ff2b343569c9d21c006fed26d08b3.tar.bz2 | |
Merge "Update alert dialog message text style, list divider opacity" into lmp-dev
| -rw-r--r-- | core/res/res/drawable/list_divider_material.xml | 2 | ||||
| -rw-r--r-- | core/res/res/drawable/list_section_divider_material.xml | 3 | ||||
| -rw-r--r-- | core/res/res/layout/alert_dialog_material.xml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/drawable/list_divider_material.xml b/core/res/res/drawable/list_divider_material.xml index 7ff212a..babb646 100644 --- a/core/res/res/drawable/list_divider_material.xml +++ b/core/res/res/drawable/list_divider_material.xml @@ -17,4 +17,4 @@ <nine-patch xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/list_divider_mtrl_alpha" android:tint="?attr/colorForeground" - android:alpha="0.16" /> + android:alpha="0.12" /> diff --git a/core/res/res/drawable/list_section_divider_material.xml b/core/res/res/drawable/list_section_divider_material.xml index 515634e..f44c3f2 100644 --- a/core/res/res/drawable/list_section_divider_material.xml +++ b/core/res/res/drawable/list_section_divider_material.xml @@ -16,4 +16,5 @@ <nine-patch xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/list_section_divider_mtrl_alpha" - android:tint="?attr/colorControlNormal" /> + android:tint="?attr/colorForeground" + android:alpha="0.12" /> diff --git a/core/res/res/layout/alert_dialog_material.xml b/core/res/res/layout/alert_dialog_material.xml index 54a1061..545d95e 100644 --- a/core/res/res/layout/alert_dialog_material.xml +++ b/core/res/res/layout/alert_dialog_material.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> <TextView android:id="@+id/message" - style="?attr/textAppearanceMedium" + style="@style/TextAppearance.Material.Subhead" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/alert_dialog_padding_material" |