Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev

23 files changed, 11 insertions, 11 deletions

diff --git a/res/drawable-sw720dp-nodpi/wallpaper_architecture.jpg b/res/drawable-sw720dp-nodpi/wallpaper_00.jpg
index fae9d4fbf..fae9d4fbf 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_architecture.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_00.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_architecture_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_00_small.jpg
index f17d9e8a1..f17d9e8a1 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_architecture_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_00_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_bubblegum.jpg b/res/drawable-sw720dp-nodpi/wallpaper_01.jpg
index d902912a7..d902912a7 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_bubblegum.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_01.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_bubblegum_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_01_small.jpg
index 587581048..587581048 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_bubblegum_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_01_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_canyon.jpg b/res/drawable-sw720dp-nodpi/wallpaper_02.jpg
index 96e3be533..96e3be533 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_canyon.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_02.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_canyon_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_02_small.jpg
index 72513b4f4..72513b4f4 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_canyon_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_02_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_chroma.jpg b/res/drawable-sw720dp-nodpi/wallpaper_03.jpg
index 355286e3e..355286e3e 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_chroma.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_03.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_chroma_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_03_small.jpg
index 781c2c7ec..781c2c7ec 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_chroma_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_03_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_escape.jpg b/res/drawable-sw720dp-nodpi/wallpaper_04.jpg
index d192ebff5..d192ebff5 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_escape.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_04.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_escape_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_04_small.jpg
index 3a1a9c12c..3a1a9c12c 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_escape_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_04_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_fidelity.jpg b/res/drawable-sw720dp-nodpi/wallpaper_05.jpg
index d7ddef438..d7ddef438 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_fidelity.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_05.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_fidelity_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_05_small.jpg
index 01092cc3c..01092cc3c 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_fidelity_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_05_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_flora.jpg b/res/drawable-sw720dp-nodpi/wallpaper_06.jpg
index ecdf0becc..ecdf0becc 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_flora.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_06.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_flora_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_06_small.jpg
index 7faebc9a4..7faebc9a4 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_flora_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_06_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_kepler.jpg b/res/drawable-sw720dp-nodpi/wallpaper_07.jpg
index c7c6c2b72..c7c6c2b72 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_kepler.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_07.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_kepler_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_07_small.jpg
index dad79a274..dad79a274 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_kepler_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_07_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_leaf.jpg b/res/drawable-sw720dp-nodpi/wallpaper_08.jpg
index 543d118f2..543d118f2 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_leaf.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_08.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_leaf_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_08_small.jpg
index f37aab932..f37aab932 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_leaf_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_08_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_noir.jpg b/res/drawable-sw720dp-nodpi/wallpaper_09.jpg
index 283bf21da..283bf21da 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_noir.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_09.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_noir_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_09_small.jpg
index 482a832f2..482a832f2 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_noir_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_09_small.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_outofthebox.jpg b/res/drawable-sw720dp-nodpi/wallpaper_10.jpg
index 1529dce4f..1529dce4f 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_outofthebox.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_10.jpg
diff --git a/res/drawable-sw720dp-nodpi/wallpaper_outofthebox_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_10_small.jpg
index 0b4cde7c0..0b4cde7c0 100644
--- a/res/drawable-sw720dp-nodpi/wallpaper_outofthebox_small.jpg
+++ b/res/drawable-sw720dp-nodpi/wallpaper_10_small.jpg
diff --git a/res/values-sw720dp/wallpapers.xml b/res/values-sw720dp/wallpapers.xml
index fb386f491..8b01477e4 100644
--- a/res/values-sw720dp/wallpapers.xml
+++ b/res/values-sw720dp/wallpapers.xml
@@ -17,16 +17,16 @@
 
 <resources>
     <string-array name="wallpapers" translatable="false">
-        <item>wallpaper_architecture</item>
-        <item>wallpaper_bubblegum</item>
-        <item>wallpaper_canyon</item>
-        <item>wallpaper_chroma</item>
-        <item>wallpaper_escape</item>
-        <item>wallpaper_fidelity</item>
-        <item>wallpaper_flora</item>
-        <item>wallpaper_kepler</item>
-        <item>wallpaper_leaf</item>
-        <item>wallpaper_noir</item>
-        <item>wallpaper_outofthebox</item>
+        <item>wallpaper_00</item>
+        <item>wallpaper_01</item>
+        <item>wallpaper_02</item>
+        <item>wallpaper_03</item>
+        <item>wallpaper_04</item>
+        <item>wallpaper_05</item>
+        <item>wallpaper_06</item>
+        <item>wallpaper_07</item>
+        <item>wallpaper_08</item>
+        <item>wallpaper_09</item>
+        <item>wallpaper_10</item>
     </string-array>
 </resources>