summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-13 17:43:49 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-13 17:43:49 -0700
commita3c36cceedb34caea37b9d2ad9d4013b6f9f031f (patch)
tree4e05a5da7f7ec7b83529add8d4e1ab14cad38558 /core
parenta49bff4e9e8e35ae9727985d91cac0df25bf3991 (diff)
parent2b52b3ed46c50befcc1111ad0f4afe294a878b22 (diff)
downloadframeworks_base-a3c36cceedb34caea37b9d2ad9d4013b6f9f031f.zip
frameworks_base-a3c36cceedb34caea37b9d2ad9d4013b6f9f031f.tar.gz
frameworks_base-a3c36cceedb34caea37b9d2ad9d4013b6f9f031f.tar.bz2
am 2b52b3e: Merge change 1610 into donut
Merge commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22' * commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22': Revert dividers back to their original translucent versions but add new opaque dividers to improve the speed of lists.
Diffstat (limited to 'core')
-rw-r--r--core/res/res/drawable/divider_horizontal_bright.9.pngbin2933 -> 240 bytes
-rw-r--r--core/res/res/drawable/divider_horizontal_bright_opaque.9.pngbin0 -> 2933 bytes
-rw-r--r--core/res/res/drawable/divider_horizontal_dark.9.pngbin2941 -> 232 bytes
-rw-r--r--core/res/res/drawable/divider_horizontal_dark_opaque.9.pngbin0 -> 2941 bytes
-rw-r--r--core/res/res/values/styles.xml8
5 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/drawable/divider_horizontal_bright.9.png b/core/res/res/drawable/divider_horizontal_bright.9.png
index 30c9b2b..144fc22 100644
--- a/core/res/res/drawable/divider_horizontal_bright.9.png
+++ b/core/res/res/drawable/divider_horizontal_bright.9.png
Binary files differ
diff --git a/core/res/res/drawable/divider_horizontal_bright_opaque.9.png b/core/res/res/drawable/divider_horizontal_bright_opaque.9.png
new file mode 100644
index 0000000..30c9b2b
--- /dev/null
+++ b/core/res/res/drawable/divider_horizontal_bright_opaque.9.png
Binary files differ
diff --git a/core/res/res/drawable/divider_horizontal_dark.9.png b/core/res/res/drawable/divider_horizontal_dark.9.png
index ce21acd..08838ca 100644
--- a/core/res/res/drawable/divider_horizontal_dark.9.png
+++ b/core/res/res/drawable/divider_horizontal_dark.9.png
Binary files differ
diff --git a/core/res/res/drawable/divider_horizontal_dark_opaque.9.png b/core/res/res/drawable/divider_horizontal_dark_opaque.9.png
new file mode 100644
index 0000000..ce21acd
--- /dev/null
+++ b/core/res/res/drawable/divider_horizontal_dark_opaque.9.png
Binary files differ
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index a436f61..8160c9c 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -330,7 +330,7 @@
<item name="android:groupIndicator">@android:drawable/expander_group</item>
<item name="android:indicatorLeft">?android:attr/expandableListPreferredItemIndicatorLeft</item>
<item name="android:indicatorRight">?android:attr/expandableListPreferredItemIndicatorRight</item>
- <item name="android:childDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="android:childDivider">@android:drawable/divider_horizontal_dark_opaque</item>
</style>
<style name="Widget.ImageWell">
@@ -398,18 +398,18 @@
<style name="Widget.ListView" parent="Widget.AbsListView">
<item name="android:listSelector">@android:drawable/list_selector_background</item>
<item name="android:cacheColorHint">?android:attr/colorBackground</item>
- <item name="android:divider">@android:drawable/divider_horizontal_dark</item>
+ <item name="android:divider">@android:drawable/divider_horizontal_dark_opaque</item>
</style>
<style name="Widget.ListView.White" parent="Widget.AbsListView">
<item name="android:listSelector">@android:drawable/list_selector_background</item>
<item name="android:background">@android:color/white</item>
- <item name="android:divider">@android:drawable/divider_horizontal_bright</item>
+ <item name="android:divider">@android:drawable/divider_horizontal_bright_opaque</item>
</style>
<style name="Widget.ListView.DropDown">
<item name="android:cacheColorHint">@null</item>
- <item name="android:divider">@android:drawable/divider_horizontal_bright</item>
+ <item name="android:divider">@android:drawable/divider_horizontal_bright_opaque</item>
</style>
<style name="Widget.ListView.Menu">