summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-11-20 14:22:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-20 14:22:55 -0800
commit58a7e315c27ef36d8104f6bfb09569ad81ec0cf5 (patch)
tree98e1bf7ad2c85d4a112d72e2dbfe5efd69b1adaf /res
parent4f11b9a062b52083c0ac279fa37b4fc635139a41 (diff)
parentfbca4b7189bf1e074aebf6e4b60919f60508df54 (diff)
downloadandroid_packages_apps_Trebuchet-58a7e315c27ef36d8104f6bfb09569ad81ec0cf5.tar.gz
android_packages_apps_Trebuchet-58a7e315c27ef36d8104f6bfb09569ad81ec0cf5.tar.bz2
android_packages_apps_Trebuchet-58a7e315c27ef36d8104f6bfb09569ad81ec0cf5.zip
am fbca4b71: am cb878268: am 4634af5d: Merge change I56e43637 into eclair
Merge commit 'fbca4b7189bf1e074aebf6e4b60919f60508df54' * commit 'fbca4b7189bf1e074aebf6e4b60919f60508df54': Final final set of wallpapers.
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/wallpaper_bluedotgrid.jpgbin0 -> 656430 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_bluedotgrid_small.jpgbin0 -> 35135 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_bluegray.jpgbin9307 -> 0 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_bluegray_small.jpgbin14305 -> 0 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_brown.jpgbin729452 -> 735421 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_brown_small.jpgbin17023 -> 17042 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_gray_small.jpgbin14260 -> 14260 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_greengray.jpgbin9307 -> 9307 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_greengray_small.jpgbin14285 -> 14317 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_lavadark.jpgbin446890 -> 0 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_lavadark_small.jpgbin21388 -> 0 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_leaves.jpgbin489204 -> 0 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_leaves_small.jpgbin37022 -> 0 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_lightgrad.jpgbin0 -> 699318 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_lightgrad_small.jpg (renamed from res/drawable-hdpi/wallpaper_redgray_small.jpg)bin14304 -> 15620 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_nexuspattern.jpgbin0 -> 330757 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_nexuspattern_small.jpgbin0 -> 24043 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_nexusrain.jpgbin287670 -> 373194 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_nexusrain_small.jpgbin26509 -> 30254 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_pcut.jpgbin511748 -> 696945 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_pcut_small.jpgbin17386 -> 18180 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_redgray.jpgbin9307 -> 0 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_ropelights.jpgbin128297 -> 236753 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_ropelights_small.jpgbin20295 -> 24844 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_x67.jpgbin332378 -> 414873 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_x67_small.jpgbin20302 -> 22502 bytes
-rw-r--r--res/values-hdpi/wallpapers.xml7
27 files changed, 3 insertions, 4 deletions
diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid.jpg
new file mode 100644
index 000000000..2fd28f9c0
--- /dev/null
+++ b/res/drawable-hdpi/wallpaper_bluedotgrid.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg
new file mode 100644
index 000000000..f5244ce3c
--- /dev/null
+++ b/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_bluegray.jpg b/res/drawable-hdpi/wallpaper_bluegray.jpg
deleted file mode 100644
index a07a25f98..000000000
--- a/res/drawable-hdpi/wallpaper_bluegray.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_bluegray_small.jpg b/res/drawable-hdpi/wallpaper_bluegray_small.jpg
deleted file mode 100644
index 8ae3771d1..000000000
--- a/res/drawable-hdpi/wallpaper_bluegray_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_brown.jpg b/res/drawable-hdpi/wallpaper_brown.jpg
index d4c4f6626..a76ddd200 100644
--- a/res/drawable-hdpi/wallpaper_brown.jpg
+++ b/res/drawable-hdpi/wallpaper_brown.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_brown_small.jpg b/res/drawable-hdpi/wallpaper_brown_small.jpg
index 153305b56..2734ead8e 100644
--- a/res/drawable-hdpi/wallpaper_brown_small.jpg
+++ b/res/drawable-hdpi/wallpaper_brown_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_gray_small.jpg b/res/drawable-hdpi/wallpaper_gray_small.jpg
index 346414212..42efeb0a8 100644
--- a/res/drawable-hdpi/wallpaper_gray_small.jpg
+++ b/res/drawable-hdpi/wallpaper_gray_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_greengray.jpg b/res/drawable-hdpi/wallpaper_greengray.jpg
index dedaa6ff1..7bb2510c1 100644
--- a/res/drawable-hdpi/wallpaper_greengray.jpg
+++ b/res/drawable-hdpi/wallpaper_greengray.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_greengray_small.jpg b/res/drawable-hdpi/wallpaper_greengray_small.jpg
index e80421111..e43a053f8 100644
--- a/res/drawable-hdpi/wallpaper_greengray_small.jpg
+++ b/res/drawable-hdpi/wallpaper_greengray_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_lavadark.jpg b/res/drawable-hdpi/wallpaper_lavadark.jpg
deleted file mode 100644
index e587e7da6..000000000
--- a/res/drawable-hdpi/wallpaper_lavadark.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_lavadark_small.jpg b/res/drawable-hdpi/wallpaper_lavadark_small.jpg
deleted file mode 100644
index e5c1d83cc..000000000
--- a/res/drawable-hdpi/wallpaper_lavadark_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_leaves.jpg b/res/drawable-hdpi/wallpaper_leaves.jpg
deleted file mode 100644
index a287f18d8..000000000
--- a/res/drawable-hdpi/wallpaper_leaves.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_leaves_small.jpg b/res/drawable-hdpi/wallpaper_leaves_small.jpg
deleted file mode 100644
index 56dcfbc7d..000000000
--- a/res/drawable-hdpi/wallpaper_leaves_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_lightgrad.jpg b/res/drawable-hdpi/wallpaper_lightgrad.jpg
new file mode 100644
index 000000000..b11f25391
--- /dev/null
+++ b/res/drawable-hdpi/wallpaper_lightgrad.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_redgray_small.jpg b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg
index d50049714..4e53bf79e 100644
--- a/res/drawable-hdpi/wallpaper_redgray_small.jpg
+++ b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuspattern.jpg b/res/drawable-hdpi/wallpaper_nexuspattern.jpg
new file mode 100644
index 000000000..2a1580c4d
--- /dev/null
+++ b/res/drawable-hdpi/wallpaper_nexuspattern.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg b/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg
new file mode 100644
index 000000000..1aa99984b
--- /dev/null
+++ b/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexusrain.jpg b/res/drawable-hdpi/wallpaper_nexusrain.jpg
index 05b56ad52..c465d4ee3 100644
--- a/res/drawable-hdpi/wallpaper_nexusrain.jpg
+++ b/res/drawable-hdpi/wallpaper_nexusrain.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg
index 66e4ec84a..9775a1143 100644
--- a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg
+++ b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_pcut.jpg b/res/drawable-hdpi/wallpaper_pcut.jpg
index eb342d6a8..c2e8ba186 100644
--- a/res/drawable-hdpi/wallpaper_pcut.jpg
+++ b/res/drawable-hdpi/wallpaper_pcut.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_pcut_small.jpg b/res/drawable-hdpi/wallpaper_pcut_small.jpg
index 81454e862..e520ab055 100644
--- a/res/drawable-hdpi/wallpaper_pcut_small.jpg
+++ b/res/drawable-hdpi/wallpaper_pcut_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_redgray.jpg b/res/drawable-hdpi/wallpaper_redgray.jpg
deleted file mode 100644
index 74c843226..000000000
--- a/res/drawable-hdpi/wallpaper_redgray.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_ropelights.jpg b/res/drawable-hdpi/wallpaper_ropelights.jpg
index 5b8fde631..258cb9797 100644
--- a/res/drawable-hdpi/wallpaper_ropelights.jpg
+++ b/res/drawable-hdpi/wallpaper_ropelights.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_ropelights_small.jpg b/res/drawable-hdpi/wallpaper_ropelights_small.jpg
index 6d1a56726..9ea969c3c 100644
--- a/res/drawable-hdpi/wallpaper_ropelights_small.jpg
+++ b/res/drawable-hdpi/wallpaper_ropelights_small.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_x67.jpg b/res/drawable-hdpi/wallpaper_x67.jpg
index d0fc791f4..7871b1d7d 100644
--- a/res/drawable-hdpi/wallpaper_x67.jpg
+++ b/res/drawable-hdpi/wallpaper_x67.jpg
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_x67_small.jpg b/res/drawable-hdpi/wallpaper_x67_small.jpg
index 1037fcaa4..ffe3ac558 100644
--- a/res/drawable-hdpi/wallpaper_x67_small.jpg
+++ b/res/drawable-hdpi/wallpaper_x67_small.jpg
Binary files differ
diff --git a/res/values-hdpi/wallpapers.xml b/res/values-hdpi/wallpapers.xml
index baffc700d..59fb1541d 100644
--- a/res/values-hdpi/wallpapers.xml
+++ b/res/values-hdpi/wallpapers.xml
@@ -24,7 +24,6 @@
<item>wallpaper_tree</item>
<item>wallpaper_zanzibar</item>
<item>wallpaper_field</item>
- <item>wallpaper_leaves</item>
<item>wallpaper_cloud</item>
<item>wallpaper_desert</item>
<item>wallpaper_goldengate</item>
@@ -32,15 +31,15 @@
<item>wallpaper_galaxy</item>
<item>wallpaper_x67</item>
<item>wallpaper_nexusrain</item>
+ <item>wallpaper_nexuspattern</item>
<item>wallpaper_nexuswallpaper1</item>
<item>wallpaper_brown</item>
- <item>wallpaper_lavadark</item>
<item>wallpaper_pcut</item>
+ <item>wallpaper_bluedotgrid</item>
<item>wallpaper_hazybluedots</item>
<item>wallpaper_ropelights</item>
- <item>wallpaper_bluegray</item>
<item>wallpaper_gray</item>
<item>wallpaper_greengray</item>
- <item>wallpaper_redgray</item>
+ <item>wallpaper_lightgrad</item>
</string-array>
</resources>