drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bug 5214224 - List item metrics"

Browse Source
This commit is contained in:
Adam Powell
2011-09-09 15:18:01 -07:00
committed by Android (Google) Code Review
parent 858c396e87 7c8375d652
commit 4eb37f8a2c
14 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -644,6 +644,8 @@ package android {
field public static final int listPreferredItemHeight = 16842829; // 0x101004d field public static final int listPreferredItemHeight = 16842829; // 0x101004d
field public static final int listPreferredItemHeightLarge = 16843668; // 0x1010394 field public static final int listPreferredItemHeightLarge = 16843668; // 0x1010394
field public static final int listPreferredItemHeightSmall = 16843669; // 0x1010395 field public static final int listPreferredItemHeightSmall = 16843669; // 0x1010395
field public static final int listPreferredItemPaddingLeft = 16843697; // 0x10103b1
field public static final int listPreferredItemPaddingRight = 16843698; // 0x10103b2
field public static final int listSelector = 16843003; // 0x10100fb field public static final int listSelector = 16843003; // 0x10100fb
field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208 field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208
field public static final int listViewStyle = 16842868; // 0x1010074 field public static final int listViewStyle = 16842868; // 0x1010074

2
core/res/res/layout/activity_list_item.xml
View File

@ -33,6 +33,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:paddingLeft="6dip" /> android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" />
</LinearLayout> </LinearLayout>

2
core/res/res/layout/activity_list_item_2.xml
View File

@ -18,7 +18,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:drawablePadding="14dip" android:drawablePadding="14dip"
android:paddingLeft="16dip" android:paddingLeft="16dip"

12
core/res/res/layout/resolve_list_item.xml
View File

@ -23,8 +23,8 @@
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingLeft="10dip" android:paddingLeft="16dip"
android:paddingRight="15dip"> android:paddingRight="16dip">
<!-- Activity icon when presenting dialog --> <!-- Activity icon when presenting dialog -->
<ImageView android:id="@+id/icon" <ImageView android:id="@+id/icon"
@ -39,18 +39,18 @@
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
<!-- Activity name --> <!-- Activity name -->
<TextView android:id="@android:id/text1" <TextView android:id="@android:id/text1"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="2" android:maxLines="2"
android:paddingLeft="10dip" /> android:paddingLeft="16dip" />
<!-- Extended activity info to distinguish between duplicate activity names --> <!-- Extended activity info to distinguish between duplicate activity names -->
<TextView android:id="@android:id/text2" <TextView android:id="@android:id/text2"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="2" android:maxLines="2"
android:paddingLeft="10dip" /> android:paddingLeft="16dip" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

8
core/res/res/layout/simple_list_item_1.xml
View File

@ -18,9 +18,9 @@
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="8dip" android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="8dip" android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeightSmall"
/> />

6
core/res/res/layout/simple_list_item_2.xml
View File

@ -24,8 +24,8 @@
<TextView android:id="@android:id/text1" <TextView android:id="@android:id/text1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dip" android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
/> />
@ -33,7 +33,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@android:id/text1" android:layout_below="@android:id/text1"
android:layout_alignLeft="@android:id/text1" android:layout_alignLeft="@android:id/text1"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
/> />

6
core/res/res/layout/simple_list_item_activated_1.xml
View File

@ -18,8 +18,10 @@
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:background="?android:attr/activatedBackgroundIndicator" android:background="?android:attr/activatedBackgroundIndicator"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeightSmall"
/> />

6
core/res/res/layout/simple_list_item_activated_2.xml
View File

@ -27,9 +27,9 @@
<TextView android:id="@android:id/text1" <TextView android:id="@android:id/text1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dip" android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginTop="8dip" android:layout_marginTop="6dip"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceListItem"
/> />
<TextView android:id="@android:id/text2" <TextView android:id="@android:id/text2"

8
core/res/res/layout/simple_list_item_checked.xml
View File

@ -17,10 +17,10 @@
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:checkMark="?android:attr/textCheckMark" android:checkMark="?android:attr/textCheckMark"
android:paddingLeft="8dip" android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="8dip" android:paddingRight="?android:attr/listPreferredItemPaddingRight"
/> />

8
core/res/res/layout/simple_list_item_single_choice.xml
View File

@ -17,10 +17,10 @@
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:checkMark="?android:attr/listChoiceIndicatorSingle" android:checkMark="?android:attr/listChoiceIndicatorSingle"
android:paddingLeft="8dip" android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="8dip" android:paddingRight="?android:attr/listPreferredItemPaddingRight"
/> />

2
core/res/res/layout/simple_spinner_item.xml
View File

@ -19,7 +19,7 @@
--> -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1" android:id="@android:id/text1"
style="?android:attr/spinnerItemStyle" style="?android:attr/spinnerItemStyle"
android:singleLine="true" android:singleLine="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

5
core/res/res/values/attrs.xml
View File

@ -235,6 +235,11 @@
<!-- The list item height for search results. @hide --> <!-- The list item height for search results. @hide -->
<attr name="searchResultListItemHeight" format="dimension" /> <attr name="searchResultListItemHeight" format="dimension" />
<!-- The preferred padding along the left edge of list items. -->
<attr name="listPreferredItemPaddingLeft" format="dimension" />
<!-- The preferred padding along the right edge of list items. -->
<attr name="listPreferredItemPaddingRight" format="dimension" />
<!-- The preferred TextAppearance for the primary text of list items. --> <!-- The preferred TextAppearance for the primary text of list items. -->
<attr name="textAppearanceListItem" format="reference" /> <attr name="textAppearanceListItem" format="reference" />
<!-- The preferred TextAppearance for the primary text of small list items. --> <!-- The preferred TextAppearance for the primary text of small list items. -->

12
core/res/res/values/public.xml
View File

@ -1798,6 +1798,14 @@
<public type="attr" name="textAppearanceListItem" /> <public type="attr" name="textAppearanceListItem" />
<public type="attr" name="textAppearanceListItemSmall" /> <public type="attr" name="textAppearanceListItemSmall" />
<public type="attr" name="targetDescriptions" />
<public type="attr" name="directionDescriptions" />
<public type="attr" name="overridesImplicitlyEnabledSubtype" />
<public type="attr" name="listPreferredItemPaddingLeft" />
<public type="attr" name="listPreferredItemPaddingRight" />
<public type="style" name="TextAppearance.SuggestionHighlight" /> <public type="style" name="TextAppearance.SuggestionHighlight" />
<public type="style" name="Theme.Holo.Light.DarkActionBar" /> <public type="style" name="Theme.Holo.Light.DarkActionBar" />
@ -2007,8 +2015,4 @@
<public type="color" name="holo_purple" /> <public type="color" name="holo_purple" />
<public type="color" name="holo_blue_bright" /> <public type="color" name="holo_blue_bright" />
<public type="attr" name="targetDescriptions" />
<public type="attr" name="directionDescriptions" />
<public type="attr" name="overridesImplicitlyEnabledSubtype" />
</resources> </resources>

6
core/res/res/values/themes.xml
View File

@ -124,6 +124,8 @@ please see themes_device_defaults.xml.
<item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeight</item> <item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeight</item>
<item name="textAppearanceListItem">?android:attr/textAppearanceLarge</item> <item name="textAppearanceListItem">?android:attr/textAppearanceLarge</item>
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceLarge</item> <item name="textAppearanceListItemSmall">?android:attr/textAppearanceLarge</item>
<item name="listPreferredItemPaddingLeft">6dip</item>
<item name="listPreferredItemPaddingRight">6dip</item>
<!-- @hide --> <!-- @hide -->
<item name="searchResultListItemHeight">58dip</item> <item name="searchResultListItemHeight">58dip</item>
@ -924,6 +926,8 @@ please see themes_device_defaults.xml.
<item name="listPreferredItemHeightLarge">80dip</item> <item name="listPreferredItemHeightLarge">80dip</item>
<item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeightSmall</item> <item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeightSmall</item>
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item> <item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item>
<item name="listPreferredItemPaddingLeft">8dip</item>
<item name="listPreferredItemPaddingRight">8dip</item>
<!-- @hide --> <!-- @hide -->
<item name="searchResultListItemHeight">58dip</item> <item name="searchResultListItemHeight">58dip</item>
@ -1229,6 +1233,8 @@ please see themes_device_defaults.xml.
<item name="listPreferredItemHeightLarge">80dip</item> <item name="listPreferredItemHeightLarge">80dip</item>
<item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeightSmall</item> <item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeightSmall</item>
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item> <item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item>
<item name="listPreferredItemPaddingLeft">8dip</item>
<item name="listPreferredItemPaddingRight">8dip</item>
<!-- @hide --> <!-- @hide -->
<item name="searchResultListItemHeight">58dip</item> <item name="searchResultListItemHeight">58dip</item>