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

Merge "Introduce listPreferredItemPaddingStart/listPreferredItemPaddingEnd"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-07-24 16:43:20 -07:00
committed by Android (Google) Code Review
parent 4725fbe6df f966ed949c
commit b8a3942527
18 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -660,8 +660,10 @@ package android {
field public static final int listPreferredItemHeight = 16842829; // 0x101004d
field public static final int listPreferredItemHeightLarge = 16843654; // 0x1010386
field public static final int listPreferredItemHeightSmall = 16843655; // 0x1010387
field public static final int listPreferredItemPaddingEnd = 16843710; // 0x10103be
field public static final int listPreferredItemPaddingLeft = 16843683; // 0x10103a3
field public static final int listPreferredItemPaddingRight = 16843684; // 0x10103a4
field public static final int listPreferredItemPaddingStart = 16843709; // 0x10103bd
field public static final int listSelector = 16843003; // 0x10100fb
field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208
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_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft" />
android:paddingStart="?android:attr/listPreferredItemPaddingStart" />
</LinearLayout>

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

@@ -26,8 +26,8 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingRight"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:duplicateParentState="true">
<TextView

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

@@ -31,8 +31,8 @@
android:layout_weight="1"
android:orientation="vertical"
android:gravity="start|center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight">
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<TextView android:id="@android:id/text1"
android:layout_width="match_parent"

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

@@ -31,8 +31,8 @@
android:layout_weight="1"
android:orientation="vertical"
android:gravity="start|center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight">
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<TextView android:id="@android:id/text1"
android:layout_width="match_parent"

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

@@ -22,8 +22,8 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:background="#19ffffff"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:gravity="center_vertical">
<TextView android:layout_width="0dp"

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

@@ -27,8 +27,8 @@
android:textStyle="bold"
android:textAllCaps="true"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="24dp"
/>
</FrameLayout>

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

@@ -23,7 +23,7 @@
android:textStyle="bold"
android:textAllCaps="true"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="24dp"
/>

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

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
/>

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

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

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

@@ -20,8 +20,8 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/activatedBackgroundIndicator"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
/>

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

@@ -27,7 +27,7 @@
<TextView android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginTop="6dip"
android:textAppearance="?android:attr/textAppearanceListItem"
/>

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

@@ -21,6 +21,6 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:checkMark="?android:attr/textCheckMark"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
/>

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

@@ -21,6 +21,6 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
/>

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

@@ -21,6 +21,6 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:checkMark="?android:attr/listChoiceIndicatorSingle"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
/>

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

@@ -275,6 +275,11 @@
<!-- The preferred item height for dropdown lists. -->
<attr name="dropdownListPreferredItemHeight" format="dimension" />
<!-- The preferred padding along the start edge of list items. -->
<attr name="listPreferredItemPaddingStart" format="dimension" />
<!-- The preferred padding along the end edge of list items. -->
<attr name="listPreferredItemPaddingEnd" format="dimension" />
<!-- ============= -->
<!-- Window styles -->
<!-- ============= -->

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

@@ -3662,9 +3662,10 @@
<!-- ===============================================================
Resources added in version 17 of the platform (Jelly Bean MRx?)
=============================================================== -->
<eat-comment />
<public type="attr" name="supportsRtl" />
<public type="attr" name="textDirection"/>
<public type="attr" name="textAlignment"/>
<public type="attr" name="textDirection" />
<public type="attr" name="textAlignment" />
<public type="attr" name="layoutDirection" />
<public type="attr" name="paddingStart"/>
<public type="attr" name="paddingEnd"/>
@@ -3676,5 +3677,7 @@
<public type="attr" name="layout_alignEnd" />
<public type="attr" name="layout_alignParentStart" />
<public type="attr" name="layout_alignParentEnd" />
<public type="attr" name="listPreferredItemPaddingStart" />
<public type="attr" name="listPreferredItemPaddingEnd" />
</resources>

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

@@ -128,6 +128,8 @@ please see themes_device_defaults.xml.
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceLarge</item>
<item name="listPreferredItemPaddingLeft">6dip</item>
<item name="listPreferredItemPaddingRight">6dip</item>
<item name="listPreferredItemPaddingStart">6dip</item>
<item name="listPreferredItemPaddingEnd">6dip</item>
<!-- @hide -->
<item name="searchResultListItemHeight">58dip</item>
@@ -637,6 +639,8 @@ please see themes_device_defaults.xml.
<item name="listPreferredItemPaddingLeft">10dip</item>
<item name="listPreferredItemPaddingRight">10dip</item>
<item name="listPreferredItemPaddingStart">10dip</item>
<item name="listPreferredItemPaddingEnd">10dip</item>
</style>
<!-- Variant of {@link Theme_Dialog} that does not include a frame (or background).
@@ -962,6 +966,8 @@ please see themes_device_defaults.xml.
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item>
<item name="listPreferredItemPaddingLeft">8dip</item>
<item name="listPreferredItemPaddingRight">8dip</item>
<item name="listPreferredItemPaddingStart">8dip</item>
<item name="listPreferredItemPaddingEnd">8dip</item>
<!-- @hide -->
<item name="searchResultListItemHeight">58dip</item>
@@ -1267,6 +1273,8 @@ please see themes_device_defaults.xml.
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item>
<item name="listPreferredItemPaddingLeft">8dip</item>
<item name="listPreferredItemPaddingRight">8dip</item>
<item name="listPreferredItemPaddingStart">8dip</item>
<item name="listPreferredItemPaddingEnd">8dip</item>
<!-- @hide -->
<item name="searchResultListItemHeight">58dip</item>
@@ -1573,6 +1581,8 @@ please see themes_device_defaults.xml.
<item name="listPreferredItemPaddingLeft">16dip</item>
<item name="listPreferredItemPaddingRight">16dip</item>
<item name="listPreferredItemPaddingStart">16dip</item>
<item name="listPreferredItemPaddingEnd">16dip</item>
</style>
<!-- Variant of Theme.Holo.Dialog that has a nice minimum width for
@@ -1681,6 +1691,8 @@ please see themes_device_defaults.xml.
<item name="listPreferredItemPaddingLeft">16dip</item>
<item name="listPreferredItemPaddingRight">16dip</item>
<item name="listPreferredItemPaddingStart">16dip</item>
<item name="listPreferredItemPaddingEnd">16dip</item>
</style>
<!-- Variant of Theme.Holo.Light.Dialog that has a nice minimum width for