diff options
| author | Adam Powell <adamp@google.com> | 2010-10-24 13:18:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-24 13:18:27 -0700 |
| commit | a8cbdb9a9ccb4cd6409be6caa47f810f1c2b6f4b (patch) | |
| tree | b9ec18202788c1994f5380776ed0cb85ffa7e35d | |
| parent | 715a89ebbf3f8c7a4621fc3a1396e6c1539bea28 (diff) | |
| parent | f876cc72c015d1d8e5824de4844f66a3e9918c2a (diff) | |
| download | frameworks_base-a8cbdb9a9ccb4cd6409be6caa47f810f1c2b6f4b.zip frameworks_base-a8cbdb9a9ccb4cd6409be6caa47f810f1c2b6f4b.tar.gz frameworks_base-a8cbdb9a9ccb4cd6409be6caa47f810f1c2b6f4b.tar.bz2 | |
Merge "Fix list dividers for holo"
| -rw-r--r-- | core/res/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 7ed5a1b..6f6f1db 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1332,6 +1332,8 @@ </style> <style name="Widget.Holo.ListView" parent="Widget.ListView"> + <item name="android:divider">?android:attr/listDivider</item> + <item name="android:listSelector">?android:attr/listChoiceBackgroundIndicator</item> </style> <style name="Widget.Holo.ListView.White"> @@ -1604,7 +1606,7 @@ <style name="Widget.Holo.Light.ImageWell" parent="Widget.ImageWell"> </style> - <style name="Widget.Holo.Light.ListView" parent="Widget.ListView"> + <style name="Widget.Holo.Light.ListView" parent="Widget.Holo.ListView"> </style> <style name="Widget.Holo.Light.ListView.White"> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 25951a1..7f6da2a 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -703,7 +703,7 @@ <item name="listPreferredItemHeight">64dip</item> <!-- @hide --> <item name="searchResultListItemHeight">58dip</item> - <item name="listDivider">@drawable/list_divider_horizontal_holo_dark</item> + <item name="listDivider">@drawable/list_divider_holo_dark</item> <item name="listSeparatorTextViewStyle">@android:style/Widget.Holo.TextView.ListSeparator</item> <item name="listChoiceIndicatorSingle">@android:drawable/btn_radio_holo_dark</item> @@ -713,7 +713,7 @@ <item name="activatedBackgroundIndicator">@android:drawable/activated_background_holo_dark</item> - <item name="listDividerAlertDialog">@android:drawable/list_divider_horizontal_holo_dark</item> + <item name="listDividerAlertDialog">@android:drawable/list_divider_holo_dark</item> <item name="expandableListPreferredItemPaddingLeft">40dip</item> <item name="expandableListPreferredChildPaddingLeft"> @@ -936,7 +936,7 @@ <item name="listPreferredItemHeight">64dip</item> <!-- @hide --> <item name="searchResultListItemHeight">58dip</item> - <item name="listDivider">@drawable/divider_horizontal_holo_light</item> + <item name="listDivider">@drawable/list_divider_holo_light</item> <item name="listSeparatorTextViewStyle">@android:style/Widget.Holo.Light.TextView.ListSeparator</item> <item name="listChoiceIndicatorSingle">@android:drawable/btn_radio_holo_light</item> @@ -957,7 +957,7 @@ <item name="expandableListPreferredChildIndicatorRight"> ?android:attr/expandableListPreferredItemIndicatorRight</item> - <item name="listDividerAlertDialog">@android:drawable/divider_horizontal_holo_light</item> + <item name="listDividerAlertDialog">@android:drawable/list_divider_holo_light</item> <!-- Gallery attributes --> <item name="galleryItemBackground">@android:drawable/gallery_item_background</item> |