diff options
| author | Adam Powell <adamp@google.com> | 2014-10-31 22:32:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 22:32:06 +0000 |
| commit | 5335d847974b4796a6f50f382ca50f32b38b23f3 (patch) | |
| tree | 4f1905ddb6b82f5229b55620b2b8d89ef4a0429e | |
| parent | 34378f3c5db2a712c8a5c42e815fa430d2556751 (diff) | |
| parent | d6b4848132ee04318283ba596ef1f5e8699336b8 (diff) | |
| download | frameworks_base-5335d847974b4796a6f50f382ca50f32b38b23f3.zip frameworks_base-5335d847974b4796a6f50f382ca50f32b38b23f3.tar.gz frameworks_base-5335d847974b4796a6f50f382ca50f32b38b23f3.tar.bz2 | |
am d6b48481: am af0a6ad8: Merge "AlertDialog metrics and measurement fixes" into lmp-mr1-dev automerge: ba6750c
* commit 'd6b4848132ee04318283ba596ef1f5e8699336b8':
AlertDialog metrics and measurement fixes
| -rw-r--r-- | core/res/res/layout/select_dialog_item_material.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/themes_material.xml | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/core/res/res/layout/select_dialog_item_material.xml b/core/res/res/layout/select_dialog_item_material.xml index fe326f3..b45edc6 100644 --- a/core/res/res/layout/select_dialog_item_material.xml +++ b/core/res/res/layout/select_dialog_item_material.xml @@ -28,6 +28,6 @@ android:textAppearance="?android:attr/textAppearanceListItemSmall" android:textColor="?android:attr/textColorAlertDialogListItem" android:gravity="center_vertical" - android:paddingStart="@dimen/alert_dialog_padding_material" - android:paddingEnd="@dimen/alert_dialog_padding_material" + android:paddingStart="?attr/listPreferredItemPaddingStart" + android:paddingEnd="?attr/listPreferredItemPaddingEnd" android:ellipsize="marquee" /> diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index 1864f89..5640fc1 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -1019,10 +1019,10 @@ please see themes_device_defaults.xml. <item name="textAppearance">@style/TextAppearance.Material</item> <item name="textAppearanceInverse">@style/TextAppearance.Material.Inverse</item> - <item name="listPreferredItemPaddingLeft">16dip</item> - <item name="listPreferredItemPaddingRight">16dip</item> - <item name="listPreferredItemPaddingStart">16dip</item> - <item name="listPreferredItemPaddingEnd">16dip</item> + <item name="listPreferredItemPaddingLeft">24dip</item> + <item name="listPreferredItemPaddingRight">24dip</item> + <item name="listPreferredItemPaddingStart">24dip</item> + <item name="listPreferredItemPaddingEnd">24dip</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="textAppearanceInverse">@style/TextAppearance.Material.Inverse</item> - <item name="listPreferredItemPaddingLeft">16dip</item> - <item name="listPreferredItemPaddingRight">16dip</item> - <item name="listPreferredItemPaddingStart">16dip</item> - <item name="listPreferredItemPaddingEnd">16dip</item> + <item name="listPreferredItemPaddingLeft">24dip</item> + <item name="listPreferredItemPaddingRight">24dip</item> + <item name="listPreferredItemPaddingStart">24dip</item> + <item name="listPreferredItemPaddingEnd">24dip</item> <item name="listDivider">@null</item> |