diff options
| author | 2011-01-24 17:24:25 -0800 | |
|---|---|---|
| committer | 2011-01-24 17:24:25 -0800 | |
| commit | 532c145540950fd3fa35d9099abdd2e4cb7d5776 (patch) | |
| tree | 723a132f798f4ad9acaaa20bb10c5f1e33112af4 | |
| parent | d2d31dadb02b45bf938761bfb6264dc599d81b3d (diff) | |
| parent | 5df3426a44c3fa7f7260bcde31a8f5792faa653f (diff) | |
Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb
| -rw-r--r-- | core/res/res/layout/popup_menu_item_layout.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/simple_spinner_dropdown_item.xml | 2 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 6 |
4 files changed, 11 insertions, 2 deletions
diff --git a/core/res/res/layout/popup_menu_item_layout.xml b/core/res/res/layout/popup_menu_item_layout.xml index d22f74a055b7..fef017d1f9eb 100644 --- a/core/res/res/layout/popup_menu_item_layout.xml +++ b/core/res/res/layout/popup_menu_item_layout.xml @@ -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"> diff --git a/core/res/res/layout/simple_spinner_dropdown_item.xml b/core/res/res/layout/simple_spinner_dropdown_item.xml index 5fd7a09aa1a6..cb999b665ed1 100644 --- a/core/res/res/layout/simple_spinner_dropdown_item.xml +++ b/core/res/res/layout/simple_spinner_dropdown_item.xml @@ -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" /> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index c808a07594a7..a404fba6dd66 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -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 --> <!-- ============= --> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 08542bf7f86e..1f9085e9df7b 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -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> |