diff --git a/api/current.txt b/api/current.txt index 8a643fd6dcd55..8e0684771dd82 100644 --- a/api/current.txt +++ b/api/current.txt @@ -958,6 +958,8 @@ package android { field public static final int textAppearanceLarge = 16842816; // 0x1010040 field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043 field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301 + field public static final int textAppearanceListItem = 16843688; // 0x10103a8 + field public static final int textAppearanceListItemSmall = 16843689; // 0x10103a9 field public static final int textAppearanceMedium = 16842817; // 0x1010041 field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044 field public static final int textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0 diff --git a/core/res/res/layout/activity_list_item.xml b/core/res/res/layout/activity_list_item.xml index 25d95fd74e5df..7022fe1858e3d 100644 --- a/core/res/res/layout/activity_list_item.xml +++ b/core/res/res/layout/activity_list_item.xml @@ -22,8 +22,8 @@ android:layout_height="wrap_content" android:paddingTop="1dip" android:paddingBottom="1dip" - android:paddingLeft="6dip" - android:paddingRight="6dip"> + android:paddingLeft="8dip" + android:paddingRight="8dip"> diff --git a/core/res/res/layout/simple_expandable_list_item_2.xml b/core/res/res/layout/simple_expandable_list_item_2.xml index b48b444e66d88..c0935fa282e53 100644 --- a/core/res/res/layout/simple_expandable_list_item_2.xml +++ b/core/res/res/layout/simple_expandable_list_item_2.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dip" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceListItem" /> diff --git a/core/res/res/layout/simple_list_item_2.xml b/core/res/res/layout/simple_list_item_2.xml index c87922cef9b2e..9b6c62a707fed 100644 --- a/core/res/res/layout/simple_list_item_2.xml +++ b/core/res/res/layout/simple_list_item_2.xml @@ -24,9 +24,9 @@ diff --git a/core/res/res/layout/simple_list_item_checked.xml b/core/res/res/layout/simple_list_item_checked.xml index 5f99044e58fd7..79d3a18464e1e 100644 --- a/core/res/res/layout/simple_list_item_checked.xml +++ b/core/res/res/layout/simple_list_item_checked.xml @@ -18,9 +18,9 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceListItem" android:gravity="center_vertical" android:checkMark="?android:attr/textCheckMark" - android:paddingLeft="6dip" - android:paddingRight="6dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" /> diff --git a/core/res/res/layout/simple_list_item_multiple_choice.xml b/core/res/res/layout/simple_list_item_multiple_choice.xml index 05c66f31510ab..03054278bd94d 100644 --- a/core/res/res/layout/simple_list_item_multiple_choice.xml +++ b/core/res/res/layout/simple_list_item_multiple_choice.xml @@ -18,9 +18,9 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceListItem" android:gravity="center_vertical" android:checkMark="?android:attr/listChoiceIndicatorMultiple" - android:paddingLeft="6dip" - android:paddingRight="6dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" /> diff --git a/core/res/res/layout/simple_list_item_single_choice.xml b/core/res/res/layout/simple_list_item_single_choice.xml index 27afd1d6f4b58..ac4a4a8cfa350 100644 --- a/core/res/res/layout/simple_list_item_single_choice.xml +++ b/core/res/res/layout/simple_list_item_single_choice.xml @@ -18,9 +18,9 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceListItem" android:gravity="center_vertical" android:checkMark="?android:attr/listChoiceIndicatorSingle" - android:paddingLeft="6dip" - android:paddingRight="6dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" /> diff --git a/core/res/res/layout/simple_selectable_list_item.xml b/core/res/res/layout/simple_selectable_list_item.xml index 518bcd0fcbd46..6ce22d611d923 100644 --- a/core/res/res/layout/simple_selectable_list_item.xml +++ b/core/res/res/layout/simple_selectable_list_item.xml @@ -18,9 +18,9 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceListItem" android:gravity="center_vertical" android:background="?android:attr/listChoiceBackgroundIndicator" - android:paddingLeft="6dip" - android:paddingRight="9dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" /> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index aa3397fac6ab2..8db6b4f346a72 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -236,6 +236,11 @@ + + + + + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 730d971d05ea7..a6bf1e0b6a167 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1792,6 +1792,9 @@ + + + diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 786cdb544f948..dd8bdd85938ab 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -122,6 +122,8 @@ please see themes_device_defaults.xml. ?android:attr/listPreferredItemHeight ?android:attr/listPreferredItemHeight ?android:attr/listPreferredItemHeight + ?android:attr/textAppearanceLarge + ?android:attr/textAppearanceLarge 58dip @@ -920,6 +922,7 @@ please see themes_device_defaults.xml. 48dip 80dip ?android:attr/listPreferredItemHeightSmall + ?android:attr/textAppearanceMedium 58dip @@ -1222,6 +1225,7 @@ please see themes_device_defaults.xml. 48dip 80dip ?android:attr/listPreferredItemHeightSmall + ?android:attr/textAppearanceMedium 58dip