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

Merge "AlertDialog metrics and measurement fixes" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2014-10-31 22:21:06 +00:00
committed by Android (Google) Code Review
parent e1678ddf7a 42c63290f7
commit af0a6ad8ab
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,6 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorAlertDialogListItem" android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="@dimen/alert_dialog_padding_material" android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="@dimen/alert_dialog_padding_material" android:paddingEnd="?attr/listPreferredItemPaddingEnd"
android:ellipsize="marquee" /> android:ellipsize="marquee" />

16
core/res/res/values/themes_material.xml
View File

@@ -1019,10 +1019,10 @@ please see themes_device_defaults.xml.
<item name="textAppearance">@style/TextAppearance.Material</item> <item name="textAppearance">@style/TextAppearance.Material</item>
<item name="textAppearanceInverse">@style/TextAppearance.Material.Inverse</item> <item name="textAppearanceInverse">@style/TextAppearance.Material.Inverse</item>
<item name="listPreferredItemPaddingLeft">16dip</item> <item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">16dip</item> <item name="listPreferredItemPaddingRight">24dip</item>
<item name="listPreferredItemPaddingStart">16dip</item> <item name="listPreferredItemPaddingStart">24dip</item>
<item name="listPreferredItemPaddingEnd">16dip</item> <item name="listPreferredItemPaddingEnd">24dip</item>
<item name="listDivider">@null</item> <item name="listDivider">@null</item>
@@ -1135,10 +1135,10 @@ please see themes_device_defaults.xml.
<item name="textAppearance">@style/TextAppearance.Material</item> <item name="textAppearance">@style/TextAppearance.Material</item>
<item name="textAppearanceInverse">@style/TextAppearance.Material.Inverse</item> <item name="textAppearanceInverse">@style/TextAppearance.Material.Inverse</item>
<item name="listPreferredItemPaddingLeft">16dip</item> <item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">16dip</item> <item name="listPreferredItemPaddingRight">24dip</item>
<item name="listPreferredItemPaddingStart">16dip</item> <item name="listPreferredItemPaddingStart">24dip</item>
<item name="listPreferredItemPaddingEnd">16dip</item> <item name="listPreferredItemPaddingEnd">24dip</item>
<item name="listDivider">@null</item> <item name="listDivider">@null</item>