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

Commit 44c3095d authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 532c1455: Merge "Fix bug 3383867 - default height for dropdown list items... 

am 532c1455: Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb

* commit '532c1455':
  Fix bug 3383867 - default height for dropdown list items in framework layouts
parents 281d36e8 532c1455

core/res/res/layout/popup_menu_item_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="48dip"

    android:layout_height="?android:attr/dropdownListPreferredItemHeight"

    android:minWidth="196dip"

    android:paddingLeft="16dip"

    android:paddingRight="16dip">

core/res/res/layout/simple_spinner_dropdown_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
    style="?android:attr/spinnerDropDownItemStyle"

    android:singleLine="true"

    android:layout_width="match_parent"

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

    android:layout_height="?android:attr/dropdownListPreferredItemHeight"

    android:ellipsize="marquee" />

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ 
        <!-- The preferred right bound for an expandable list child's indicator. -->

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



        <!-- The preferred item height for dropdown lists. -->

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



        <!-- ============= -->

        <!-- Window styles -->

        <!-- ============= -->

core/res/res/values/themes.xml

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ 


        <!-- List attributes -->

        <item name="listPreferredItemHeight">64dip</item>

        <item name="dropdownListPreferredItemHeight">64dip</item>



        <!-- @hide -->

        <item name="searchResultListItemHeight">58dip</item>

        <item name="listDivider">@drawable/divider_horizontal_dark</item>
@@ -813,6 +815,8 @@ 


        <!-- List attributes -->

        <item name="listPreferredItemHeight">64dip</item>

        <item name="dropdownListPreferredItemHeight">48dip</item>



        <!-- @hide -->

        <item name="searchResultListItemHeight">58dip</item>

        <item name="listDivider">@drawable/list_divider_holo_dark</item>
@@ -1084,6 +1088,8 @@ 


        <!-- List attributes -->

        <item name="listPreferredItemHeight">64dip</item>

        <item name="dropdownListPreferredItemHeight">48dip</item>



        <!-- @hide -->

        <item name="searchResultListItemHeight">58dip</item>

        <item name="listDivider">@drawable/list_divider_holo_light</item>