Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 414c4984 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Create theme attributes for small and large listPreferredItemHeight.... 

Merge "Create theme attributes for small and large listPreferredItemHeight. Change default holo dialog list items to use them."
parents dc122622 c8834722

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -628,6 +628,8 @@ package android { 
    field public static final int listDividerAlertDialog = 16843525; // 0x1010305

    field public static final int listPopupWindowStyle = 16843519; // 0x10102ff

    field public static final int listPreferredItemHeight = 16842829; // 0x101004d

    field public static final int listPreferredItemHeightLarge = 16843670; // 0x1010396

    field public static final int listPreferredItemHeightSmall = 16843671; // 0x1010397

    field public static final int listSelector = 16843003; // 0x10100fb

    field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208

    field public static final int listViewStyle = 16842868; // 0x1010074

core/res/res/layout/select_dialog_item_holo.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:id="@android:id/text1"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

core/res/res/layout/select_dialog_multichoice_holo.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:id="@android:id/text1"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

core/res/res/layout/select_dialog_singlechoice_holo.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:id="@android:id/text1"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

core/res/res/values/attrs.xml

+6 −1
Original line number Diff line number Diff line
@@ -202,9 +202,14 @@ 


        <!-- The preferred list item height. -->

        <attr name="listPreferredItemHeight" format="dimension" />

        <!-- The drawable for the list divider. -->

        <!-- A smaller, sleeker list item height. -->

        <attr name="listPreferredItemHeightSmall" format="dimension" />

        <!-- A larger, more robust list item height. -->

        <attr name="listPreferredItemHeightLarge" format="dimension" />

        <!-- The list item height for search results. @hide -->

        <attr name="searchResultListItemHeight" format="dimension" />



        <!-- The drawable for the list divider. -->

        <attr name="listDivider" format="reference" />

        <!-- The list divider used in alert dialogs. -->

        <attr name="listDividerAlertDialog" format="reference" />