Merge branch 'eclair' into eclair-release

res/raw/rollo3.c

@@ -378,10 +378,11 @@ void drawStrip(float row, float column, int isTop, int iconNum, float p)
         offset = positionStrip(row + 0.73f, column, isTop, p, 1);
     }
     if (offset < -20) return;
+    if (offset > 200) return;
     bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_LABEL_IDS, iconNum));
     offset = clamp(offset, 0, 199 - 20);
-    //drawSimpleMeshRange(NAMED_SMMesh, offset * 6, 20 * 6);
-    drawSimpleMesh(NAMED_SMMesh);
+    drawSimpleMeshRange(NAMED_SMMesh, offset * 6, 20 * 6);
+    //drawSimpleMesh(NAMED_SMMesh);
 }
 
 void drawTop(float rowOffset, float p)

res/values-hdpi/wallpapers.xml

@@ -24,23 +24,23 @@
         <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>
+        <item>wallpaper_despair</item>
         <item>wallpaper_grass_night</item>
         <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>