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

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

Browse Source 
* commit '532c145540950fd3fa35d9099abdd2e4cb7d5776':
  Fix bug 3383867 - default height for dropdown list items in framework layouts
This commit is contained in:
Adam Powell
2011-01-24 17:26:50 -08:00
committed by Android Git Automerger
parent 281d36e8f5 532c145540
commit 44c3095d1e
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
<com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" <com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dip" android:layout_height="?android:attr/dropdownListPreferredItemHeight"
android:minWidth="196dip" android:minWidth="196dip"
android:paddingLeft="16dip" android:paddingLeft="16dip"
android:paddingRight="16dip"> android:paddingRight="16dip">

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

@@ -22,5 +22,5 @@
style="?android:attr/spinnerDropDownItemStyle" style="?android:attr/spinnerDropDownItemStyle"
android:singleLine="true" android:singleLine="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/dropdownListPreferredItemHeight"
android:ellipsize="marquee" /> android:ellipsize="marquee" />

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

@@ -223,6 +223,9 @@
<!-- The preferred right bound for an expandable list child's indicator. --> <!-- The preferred right bound for an expandable list child's indicator. -->
<attr name="expandableListPreferredChildIndicatorRight" format="dimension" /> <attr name="expandableListPreferredChildIndicatorRight" format="dimension" />
<!-- The preferred item height for dropdown lists. -->
<attr name="dropdownListPreferredItemHeight" format="dimension" />
<!-- ============= --> <!-- ============= -->
<!-- Window styles --> <!-- Window styles -->
<!-- ============= --> <!-- ============= -->

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

@@ -95,6 +95,8 @@
<!-- List attributes --> <!-- List attributes -->
<item name="listPreferredItemHeight">64dip</item> <item name="listPreferredItemHeight">64dip</item>
<item name="dropdownListPreferredItemHeight">64dip</item>
<!-- @hide --> <!-- @hide -->
<item name="searchResultListItemHeight">58dip</item> <item name="searchResultListItemHeight">58dip</item>
<item name="listDivider">@drawable/divider_horizontal_dark</item> <item name="listDivider">@drawable/divider_horizontal_dark</item>
@@ -813,6 +815,8 @@
<!-- List attributes --> <!-- List attributes -->
<item name="listPreferredItemHeight">64dip</item> <item name="listPreferredItemHeight">64dip</item>
<item name="dropdownListPreferredItemHeight">48dip</item>
<!-- @hide --> <!-- @hide -->
<item name="searchResultListItemHeight">58dip</item> <item name="searchResultListItemHeight">58dip</item>
<item name="listDivider">@drawable/list_divider_holo_dark</item> <item name="listDivider">@drawable/list_divider_holo_dark</item>
@@ -1084,6 +1088,8 @@
<!-- List attributes --> <!-- List attributes -->
<item name="listPreferredItemHeight">64dip</item> <item name="listPreferredItemHeight">64dip</item>
<item name="dropdownListPreferredItemHeight">48dip</item>
<!-- @hide --> <!-- @hide -->
<item name="searchResultListItemHeight">58dip</item> <item name="searchResultListItemHeight">58dip</item>
<item name="listDivider">@drawable/list_divider_holo_light</item> <item name="listDivider">@drawable/list_divider_holo_light</item>