| commit | b674363058dc2c29216e777b314d975a21cdab45 | [log] [tgz] |
|---|---|---|
| author | Katherine Kuan <katherinekuan@google.com> | Tue Aug 09 18:34:34 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 09 18:34:34 2011 -0700 |
| tree | 235dcb1442ae1d08780f95abdc1f0809bd7403e6 | |
| parent | 413f36a0c26cb42f844b335e70d0ceb466321e0a [diff] | |
| parent | 071518884966ebdf23c5441827b5393f38a93f0f [diff] |
Merge "Replace list item selection assets"
diff --git a/res/drawable-hdpi/list_activated_holo.9.png b/res/drawable-hdpi/list_activated_holo.9.png index 7b89319..046b24a 100644 --- a/res/drawable-hdpi/list_activated_holo.9.png +++ b/res/drawable-hdpi/list_activated_holo.9.png Binary files differ
diff --git a/res/drawable-hdpi/list_background_holo.9.png b/res/drawable-hdpi/list_background_holo.9.png index e382b2d..cddf9be 100644 --- a/res/drawable-hdpi/list_background_holo.9.png +++ b/res/drawable-hdpi/list_background_holo.9.png Binary files differ
diff --git a/res/drawable-mdpi/list_activated_holo.9.png b/res/drawable-mdpi/list_activated_holo.9.png index 4d98919..1ff3373 100644 --- a/res/drawable-mdpi/list_activated_holo.9.png +++ b/res/drawable-mdpi/list_activated_holo.9.png Binary files differ
diff --git a/res/drawable-mdpi/list_background_holo.9.png b/res/drawable-mdpi/list_background_holo.9.png index ca2f750..7d5d66d 100644 --- a/res/drawable-mdpi/list_background_holo.9.png +++ b/res/drawable-mdpi/list_background_holo.9.png Binary files differ
diff --git a/res/drawable-xhdpi/list_activated_holo.9.png b/res/drawable-xhdpi/list_activated_holo.9.png index 4e13add..2eb7c7e 100644 --- a/res/drawable-xhdpi/list_activated_holo.9.png +++ b/res/drawable-xhdpi/list_activated_holo.9.png Binary files differ
diff --git a/res/drawable-xhdpi/list_background_holo.9.png b/res/drawable-xhdpi/list_background_holo.9.png index adba6a8..b652725 100644 --- a/res/drawable-xhdpi/list_background_holo.9.png +++ b/res/drawable-xhdpi/list_background_holo.9.png Binary files differ
diff --git a/res/drawable/list_item_activated_background.xml b/res/drawable/list_item_activated_background.xml index 334e8ec..6ea21d3 100644 --- a/res/drawable/list_item_activated_background.xml +++ b/res/drawable/list_item_activated_background.xml
@@ -17,5 +17,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" /> - <item android:drawable="@android:color/transparent" /> -</selector> + <item android:drawable="@drawable/list_background_holo" /> +</selector> \ No newline at end of file
diff --git a/res/values-sw580dp-w720dp/styles.xml b/res/values-sw580dp-w720dp/styles.xml index 05ac532..ff50d45 100644 --- a/res/values-sw580dp-w720dp/styles.xml +++ b/res/values-sw580dp-w720dp/styles.xml
@@ -21,7 +21,6 @@ <item name="android:textColorSecondary">@color/secondary_text_color</item> <item name="list_item_height">66dip</item> <item name="activated_background">@drawable/list_item_activated_background</item> - <item name="android:windowContentOverlay">@null</item> <item name="section_header_background">@drawable/list_title_holo</item> <item name="list_item_divider">?android:attr/listDivider</item> <item name="list_item_padding_top">0dip</item>
diff --git a/res/values-sw580dp/styles.xml b/res/values-sw580dp/styles.xml index 871d566..a386e57 100644 --- a/res/values-sw580dp/styles.xml +++ b/res/values-sw580dp/styles.xml
@@ -21,7 +21,6 @@ <item name="android:textColorSecondary">@color/secondary_text_color</item> <item name="list_item_height">66dip</item> <item name="activated_background">@drawable/list_item_activated_background</item> - <item name="android:windowContentOverlay">@null</item> <item name="section_header_background">@drawable/list_title_holo</item> <item name="list_item_divider">?android:attr/listDivider</item> <item name="list_item_padding_top">0dip</item>
