diff options
| author | Adam Powell <adamp@google.com> | 2014-10-31 22:21:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 22:21:07 +0000 |
| commit | af0a6ad8ab29fea9b7b164168d4d080fe010e83a (patch) | |
| tree | 465dd2963fbcdbd857c70aac1c1276a9b8053ba0 | |
| parent | e1678ddf7a8311c79ccba5a6b6183f9484fa1f1f (diff) | |
| parent | 42c63290f778533fb52e80d7db81e3d866235f9c (diff) | |
| download | frameworks_base-af0a6ad8ab29fea9b7b164168d4d080fe010e83a.zip frameworks_base-af0a6ad8ab29fea9b7b164168d4d080fe010e83a.tar.gz frameworks_base-af0a6ad8ab29fea9b7b164168d4d080fe010e83a.tar.bz2 | |
Merge "AlertDialog metrics and measurement fixes" into lmp-mr1-dev
| -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> |