Merge "Reduce peak memory use in PagedView"
diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid.jpg
deleted file mode 100644
index 468edfe..0000000
--- a/res/drawable-hdpi/wallpaper_bluedotgrid.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg
deleted file mode 100644
index 1ff9568..0000000
--- a/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_brown.jpg b/res/drawable-hdpi/wallpaper_brown.jpg
deleted file mode 100644
index 9b7ef20..0000000
--- a/res/drawable-hdpi/wallpaper_brown.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_brown_small.jpg b/res/drawable-hdpi/wallpaper_brown_small.jpg
deleted file mode 100644
index e5b417e..0000000
--- a/res/drawable-hdpi/wallpaper_brown_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_canyon.jpg b/res/drawable-hdpi/wallpaper_canyon.jpg
deleted file mode 100644
index 1b129fd..0000000
--- a/res/drawable-hdpi/wallpaper_canyon.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_canyon_small.jpg b/res/drawable-hdpi/wallpaper_canyon_small.jpg
deleted file mode 100644
index fd4d72f..0000000
--- a/res/drawable-hdpi/wallpaper_canyon_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_cloud.jpg b/res/drawable-hdpi/wallpaper_cloud.jpg
deleted file mode 100644
index f3b5545..0000000
--- a/res/drawable-hdpi/wallpaper_cloud.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_cloud_small.jpg b/res/drawable-hdpi/wallpaper_cloud_small.jpg
deleted file mode 100644
index 0e4c14c..0000000
--- a/res/drawable-hdpi/wallpaper_cloud_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_desert.jpg b/res/drawable-hdpi/wallpaper_desert.jpg
deleted file mode 100644
index 47daa79..0000000
--- a/res/drawable-hdpi/wallpaper_desert.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_desert_small.jpg b/res/drawable-hdpi/wallpaper_desert_small.jpg
deleted file mode 100644
index 9252d36..0000000
--- a/res/drawable-hdpi/wallpaper_desert_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_despair.jpg b/res/drawable-hdpi/wallpaper_despair.jpg
deleted file mode 100644
index 57e8235..0000000
--- a/res/drawable-hdpi/wallpaper_despair.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_despair_small.jpg b/res/drawable-hdpi/wallpaper_despair_small.jpg
deleted file mode 100644
index fc8e3c6..0000000
--- a/res/drawable-hdpi/wallpaper_despair_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_electric.jpg b/res/drawable-hdpi/wallpaper_electric.jpg
deleted file mode 100644
index f7800af..0000000
--- a/res/drawable-hdpi/wallpaper_electric.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_electric_small.jpg b/res/drawable-hdpi/wallpaper_electric_small.jpg
deleted file mode 100644
index 66dd573..0000000
--- a/res/drawable-hdpi/wallpaper_electric_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_field.jpg b/res/drawable-hdpi/wallpaper_field.jpg
deleted file mode 100644
index 5bab9b5..0000000
--- a/res/drawable-hdpi/wallpaper_field.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_field_small.jpg b/res/drawable-hdpi/wallpaper_field_small.jpg
deleted file mode 100644
index 20d9a48..0000000
--- a/res/drawable-hdpi/wallpaper_field_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_galaxy.jpg b/res/drawable-hdpi/wallpaper_galaxy.jpg
deleted file mode 100644
index de0f3ff..0000000
--- a/res/drawable-hdpi/wallpaper_galaxy.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_galaxy_small.jpg b/res/drawable-hdpi/wallpaper_galaxy_small.jpg
deleted file mode 100644
index 69d48a2..0000000
--- a/res/drawable-hdpi/wallpaper_galaxy_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_goldengate.jpg b/res/drawable-hdpi/wallpaper_goldengate.jpg
deleted file mode 100644
index 2271091..0000000
--- a/res/drawable-hdpi/wallpaper_goldengate.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_goldengate_small.jpg b/res/drawable-hdpi/wallpaper_goldengate_small.jpg
deleted file mode 100644
index e9aca1e..0000000
--- a/res/drawable-hdpi/wallpaper_goldengate_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_grass.jpg b/res/drawable-hdpi/wallpaper_grass.jpg
deleted file mode 100644
index e9dc541..0000000
--- a/res/drawable-hdpi/wallpaper_grass.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_grass_night.jpg b/res/drawable-hdpi/wallpaper_grass_night.jpg
deleted file mode 100644
index b9c74c9..0000000
--- a/res/drawable-hdpi/wallpaper_grass_night.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_grass_night_small.jpg b/res/drawable-hdpi/wallpaper_grass_night_small.jpg
deleted file mode 100644
index 353eb18..0000000
--- a/res/drawable-hdpi/wallpaper_grass_night_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_grass_small.jpg b/res/drawable-hdpi/wallpaper_grass_small.jpg
deleted file mode 100644
index dc45738..0000000
--- a/res/drawable-hdpi/wallpaper_grass_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_gray.jpg b/res/drawable-hdpi/wallpaper_gray.jpg
deleted file mode 100644
index 913f053..0000000
--- a/res/drawable-hdpi/wallpaper_gray.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_gray_small.jpg b/res/drawable-hdpi/wallpaper_gray_small.jpg
deleted file mode 100644
index d083a74..0000000
--- a/res/drawable-hdpi/wallpaper_gray_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_greengray.jpg b/res/drawable-hdpi/wallpaper_greengray.jpg
deleted file mode 100644
index 1f3c86c..0000000
--- a/res/drawable-hdpi/wallpaper_greengray.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_greengray_small.jpg b/res/drawable-hdpi/wallpaper_greengray_small.jpg
deleted file mode 100644
index ebf7066..0000000
--- a/res/drawable-hdpi/wallpaper_greengray_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_hazybluedots.jpg b/res/drawable-hdpi/wallpaper_hazybluedots.jpg
deleted file mode 100644
index fe6aeb4..0000000
--- a/res/drawable-hdpi/wallpaper_hazybluedots.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg b/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg
deleted file mode 100644
index c645dea..0000000
--- a/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_lightgrad.jpg b/res/drawable-hdpi/wallpaper_lightgrad.jpg
deleted file mode 100644
index 35a45fa..0000000
--- a/res/drawable-hdpi/wallpaper_lightgrad.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_lightgrad_small.jpg b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg
deleted file mode 100644
index f909da7..0000000
--- a/res/drawable-hdpi/wallpaper_lightgrad_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_monumentvalley.jpg b/res/drawable-hdpi/wallpaper_monumentvalley.jpg
deleted file mode 100644
index 1bb5f2c..0000000
--- a/res/drawable-hdpi/wallpaper_monumentvalley.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_monumentvalley_small.jpg b/res/drawable-hdpi/wallpaper_monumentvalley_small.jpg
deleted file mode 100644
index 9ea3309..0000000
--- a/res/drawable-hdpi/wallpaper_monumentvalley_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuspattern.jpg b/res/drawable-hdpi/wallpaper_nexuspattern.jpg
deleted file mode 100644
index 212a7b1..0000000
--- a/res/drawable-hdpi/wallpaper_nexuspattern.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg b/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg
deleted file mode 100644
index 8e474a5..0000000
--- a/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexusrain.jpg b/res/drawable-hdpi/wallpaper_nexusrain.jpg
deleted file mode 100644
index 46c2971..0000000
--- a/res/drawable-hdpi/wallpaper_nexusrain.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg
deleted file mode 100644
index a239339..0000000
--- a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
deleted file mode 100644
index d761b4a..0000000
--- a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg b/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg
deleted file mode 100644
index 70882bb..0000000
--- a/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_pcut.jpg b/res/drawable-hdpi/wallpaper_pcut.jpg
deleted file mode 100644
index bb9914d..0000000
--- a/res/drawable-hdpi/wallpaper_pcut.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_pcut_small.jpg b/res/drawable-hdpi/wallpaper_pcut_small.jpg
deleted file mode 100644
index bd19775..0000000
--- a/res/drawable-hdpi/wallpaper_pcut_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_picker_preview.png b/res/drawable-hdpi/wallpaper_picker_preview.png
deleted file mode 100644
index b48899a..0000000
--- a/res/drawable-hdpi/wallpaper_picker_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_ropelights.jpg b/res/drawable-hdpi/wallpaper_ropelights.jpg
deleted file mode 100644
index ca7862f..0000000
--- a/res/drawable-hdpi/wallpaper_ropelights.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_ropelights_small.jpg b/res/drawable-hdpi/wallpaper_ropelights_small.jpg
deleted file mode 100644
index ac6fb29..0000000
--- a/res/drawable-hdpi/wallpaper_ropelights_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_tree.jpg b/res/drawable-hdpi/wallpaper_tree.jpg
deleted file mode 100644
index f998bea..0000000
--- a/res/drawable-hdpi/wallpaper_tree.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_tree_small.jpg b/res/drawable-hdpi/wallpaper_tree_small.jpg
deleted file mode 100644
index 425305a..0000000
--- a/res/drawable-hdpi/wallpaper_tree_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_x67.jpg b/res/drawable-hdpi/wallpaper_x67.jpg
deleted file mode 100644
index 400aa27..0000000
--- a/res/drawable-hdpi/wallpaper_x67.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_x67_small.jpg b/res/drawable-hdpi/wallpaper_x67_small.jpg
deleted file mode 100644
index 10e0faa..0000000
--- a/res/drawable-hdpi/wallpaper_x67_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_zanzibar.jpg b/res/drawable-hdpi/wallpaper_zanzibar.jpg
deleted file mode 100644
index 9218895..0000000
--- a/res/drawable-hdpi/wallpaper_zanzibar.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_zanzibar_small.jpg b/res/drawable-hdpi/wallpaper_zanzibar_small.jpg
deleted file mode 100644
index affdc8c..0000000
--- a/res/drawable-hdpi/wallpaper_zanzibar_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_beach.jpg b/res/drawable-mdpi/wallpaper_beach.jpg
deleted file mode 100644
index b502092..0000000
--- a/res/drawable-mdpi/wallpaper_beach.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_beach_small.jpg b/res/drawable-mdpi/wallpaper_beach_small.jpg
deleted file mode 100644
index 46051cc..0000000
--- a/res/drawable-mdpi/wallpaper_beach_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_blue.jpg b/res/drawable-mdpi/wallpaper_blue.jpg
deleted file mode 100644
index 0edd6bd..0000000
--- a/res/drawable-mdpi/wallpaper_blue.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_blue_small.jpg b/res/drawable-mdpi/wallpaper_blue_small.jpg
deleted file mode 100644
index 5cf585a..0000000
--- a/res/drawable-mdpi/wallpaper_blue_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_green.jpg b/res/drawable-mdpi/wallpaper_green.jpg
deleted file mode 100644
index 36c9e08..0000000
--- a/res/drawable-mdpi/wallpaper_green.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_green_small.jpg b/res/drawable-mdpi/wallpaper_green_small.jpg
deleted file mode 100644
index d7c28ec..0000000
--- a/res/drawable-mdpi/wallpaper_green_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grey.jpg b/res/drawable-mdpi/wallpaper_grey.jpg
deleted file mode 100644
index ca48e6a..0000000
--- a/res/drawable-mdpi/wallpaper_grey.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grey_small.jpg b/res/drawable-mdpi/wallpaper_grey_small.jpg
deleted file mode 100644
index 1734d2e..0000000
--- a/res/drawable-mdpi/wallpaper_grey_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish.jpg b/res/drawable-mdpi/wallpaper_jellyfish.jpg
deleted file mode 100644
index 659228b..0000000
--- a/res/drawable-mdpi/wallpaper_jellyfish.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish_small.jpg b/res/drawable-mdpi/wallpaper_jellyfish_small.jpg
deleted file mode 100644
index 4e5d134..0000000
--- a/res/drawable-mdpi/wallpaper_jellyfish_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lake.jpg b/res/drawable-mdpi/wallpaper_lake.jpg
deleted file mode 100644
index 5ba522f..0000000
--- a/res/drawable-mdpi/wallpaper_lake.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lake_small.jpg b/res/drawable-mdpi/wallpaper_lake_small.jpg
deleted file mode 100644
index 36d56cc..0000000
--- a/res/drawable-mdpi/wallpaper_lake_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_mountain.jpg b/res/drawable-mdpi/wallpaper_mountain.jpg
deleted file mode 100644
index 1376177..0000000
--- a/res/drawable-mdpi/wallpaper_mountain.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_mountain_small.jpg b/res/drawable-mdpi/wallpaper_mountain_small.jpg
deleted file mode 100644
index e2d5ac2..0000000
--- a/res/drawable-mdpi/wallpaper_mountain_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
deleted file mode 100644
index b5e8767..0000000
--- a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_path.jpg b/res/drawable-mdpi/wallpaper_path.jpg
deleted file mode 100644
index e1c98c0..0000000
--- a/res/drawable-mdpi/wallpaper_path.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_path_small.jpg b/res/drawable-mdpi/wallpaper_path_small.jpg
deleted file mode 100644
index f47d7a7..0000000
--- a/res/drawable-mdpi/wallpaper_path_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_picker_preview.png b/res/drawable-mdpi/wallpaper_picker_preview.png
deleted file mode 100644
index b48899a..0000000
--- a/res/drawable-mdpi/wallpaper_picker_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pink.jpg b/res/drawable-mdpi/wallpaper_pink.jpg
deleted file mode 100644
index 74403e5..0000000
--- a/res/drawable-mdpi/wallpaper_pink.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pink_small.jpg b/res/drawable-mdpi/wallpaper_pink_small.jpg
deleted file mode 100644
index 42b1770..0000000
--- a/res/drawable-mdpi/wallpaper_pink_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_road.jpg b/res/drawable-mdpi/wallpaper_road.jpg
deleted file mode 100644
index 3aaa639..0000000
--- a/res/drawable-mdpi/wallpaper_road.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_road_small.jpg b/res/drawable-mdpi/wallpaper_road_small.jpg
deleted file mode 100644
index 0b0c390..0000000
--- a/res/drawable-mdpi/wallpaper_road_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_snow_leopard.jpg b/res/drawable-mdpi/wallpaper_snow_leopard.jpg
deleted file mode 100644
index bcbc51e..0000000
--- a/res/drawable-mdpi/wallpaper_snow_leopard.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg b/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg
deleted file mode 100644
index 99db5c6..0000000
--- a/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise.jpg b/res/drawable-mdpi/wallpaper_sunrise.jpg
deleted file mode 100644
index 4ee8d5d..0000000
--- a/res/drawable-mdpi/wallpaper_sunrise.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise_small.jpg b/res/drawable-mdpi/wallpaper_sunrise_small.jpg
deleted file mode 100644
index 248b7e7..0000000
--- a/res/drawable-mdpi/wallpaper_sunrise_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunset.jpg b/res/drawable-mdpi/wallpaper_sunset.jpg
deleted file mode 100644
index bcfd8d4..0000000
--- a/res/drawable-mdpi/wallpaper_sunset.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunset_small.jpg b/res/drawable-mdpi/wallpaper_sunset_small.jpg
deleted file mode 100644
index d5e5add..0000000
--- a/res/drawable-mdpi/wallpaper_sunset_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar.jpg b/res/drawable-mdpi/wallpaper_zanzibar.jpg
deleted file mode 100644
index fb13374..0000000
--- a/res/drawable-mdpi/wallpaper_zanzibar.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg b/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
deleted file mode 100644
index 700a7fe..0000000
--- a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_architecture.jpg b/res/drawable-nodpi/wallpaper_architecture.jpg
new file mode 100644
index 0000000..82aafb7
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_architecture.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_architecture_small.jpg b/res/drawable-nodpi/wallpaper_architecture_small.jpg
new file mode 100644
index 0000000..f17d9e8
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_architecture_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_bubblegum.jpg b/res/drawable-nodpi/wallpaper_bubblegum.jpg
new file mode 100644
index 0000000..e8a717d
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_bubblegum.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_bubblegum_small.jpg b/res/drawable-nodpi/wallpaper_bubblegum_small.jpg
new file mode 100644
index 0000000..5875810
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_bubblegum_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_canyon.jpg b/res/drawable-nodpi/wallpaper_canyon.jpg
new file mode 100644
index 0000000..85aaba4
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_canyon.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_canyon_small.jpg b/res/drawable-nodpi/wallpaper_canyon_small.jpg
new file mode 100644
index 0000000..72513b4
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_canyon_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_chroma.jpg b/res/drawable-nodpi/wallpaper_chroma.jpg
new file mode 100644
index 0000000..7e92243
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_chroma.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_chroma_small.jpg b/res/drawable-nodpi/wallpaper_chroma_small.jpg
new file mode 100644
index 0000000..781c2c7
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_chroma_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_escape.jpg b/res/drawable-nodpi/wallpaper_escape.jpg
new file mode 100644
index 0000000..ced555b
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_escape.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_escape_small.jpg b/res/drawable-nodpi/wallpaper_escape_small.jpg
new file mode 100644
index 0000000..3a1a9c1
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_escape_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_fidelity.jpg b/res/drawable-nodpi/wallpaper_fidelity.jpg
new file mode 100644
index 0000000..1f1eb31
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_fidelity.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_fidelity_small.jpg b/res/drawable-nodpi/wallpaper_fidelity_small.jpg
new file mode 100644
index 0000000..01092cc
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_fidelity_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_flora.jpg b/res/drawable-nodpi/wallpaper_flora.jpg
new file mode 100644
index 0000000..964e37c
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_flora.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_flora_small.jpg b/res/drawable-nodpi/wallpaper_flora_small.jpg
new file mode 100644
index 0000000..7faebc9
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_flora_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_kepler.jpg b/res/drawable-nodpi/wallpaper_kepler.jpg
new file mode 100644
index 0000000..4afee40
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_kepler.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_kepler_small.jpg b/res/drawable-nodpi/wallpaper_kepler_small.jpg
new file mode 100644
index 0000000..dad79a2
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_kepler_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_leaf.jpg b/res/drawable-nodpi/wallpaper_leaf.jpg
new file mode 100644
index 0000000..7157ddd
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_leaf.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_leaf_small.jpg b/res/drawable-nodpi/wallpaper_leaf_small.jpg
new file mode 100644
index 0000000..f37aab9
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_leaf_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_noir.jpg b/res/drawable-nodpi/wallpaper_noir.jpg
new file mode 100644
index 0000000..1962495
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_noir.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_noir_small.jpg b/res/drawable-nodpi/wallpaper_noir_small.jpg
new file mode 100644
index 0000000..482a832
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_noir_small.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_outofthebox.jpg b/res/drawable-nodpi/wallpaper_outofthebox.jpg
new file mode 100644
index 0000000..6049dcc
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_outofthebox.jpg
Binary files differ
diff --git a/res/drawable-nodpi/wallpaper_outofthebox_small.jpg b/res/drawable-nodpi/wallpaper_outofthebox_small.jpg
new file mode 100644
index 0000000..0b4cde7
--- /dev/null
+++ b/res/drawable-nodpi/wallpaper_outofthebox_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bluecrystal.jpg b/res/drawable-sw600dp-nodpi/bluecrystal.jpg
deleted file mode 100755
index d8caefb..0000000
--- a/res/drawable-sw600dp-nodpi/bluecrystal.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bluecrystal_small.jpg b/res/drawable-sw600dp-nodpi/bluecrystal_small.jpg
deleted file mode 100755
index 8104743..0000000
--- a/res/drawable-sw600dp-nodpi/bluecrystal_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bluelinebots.jpg b/res/drawable-sw600dp-nodpi/bluelinebots.jpg
deleted file mode 100644
index 26dce37..0000000
--- a/res/drawable-sw600dp-nodpi/bluelinebots.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bluelinebots_small.jpg b/res/drawable-sw600dp-nodpi/bluelinebots_small.jpg
deleted file mode 100755
index 4de80f1..0000000
--- a/res/drawable-sw600dp-nodpi/bluelinebots_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bots.jpg b/res/drawable-sw600dp-nodpi/bots.jpg
deleted file mode 100755
index ee3b715..0000000
--- a/res/drawable-sw600dp-nodpi/bots.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bots_small.jpg b/res/drawable-sw600dp-nodpi/bots_small.jpg
deleted file mode 100755
index 4889897..0000000
--- a/res/drawable-sw600dp-nodpi/bots_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bucky.jpg b/res/drawable-sw600dp-nodpi/bucky.jpg
deleted file mode 100755
index 20a5034..0000000
--- a/res/drawable-sw600dp-nodpi/bucky.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bucky_small.jpg b/res/drawable-sw600dp-nodpi/bucky_small.jpg
deleted file mode 100755
index 87b4dc9..0000000
--- a/res/drawable-sw600dp-nodpi/bucky_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/city.jpg b/res/drawable-sw600dp-nodpi/city.jpg
deleted file mode 100644
index 9b4041f..0000000
--- a/res/drawable-sw600dp-nodpi/city.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/city_small.jpg b/res/drawable-sw600dp-nodpi/city_small.jpg
deleted file mode 100644
index e267750..0000000
--- a/res/drawable-sw600dp-nodpi/city_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/flowerbot.jpg b/res/drawable-sw600dp-nodpi/flowerbot.jpg
deleted file mode 100644
index 5d9bb75..0000000
--- a/res/drawable-sw600dp-nodpi/flowerbot.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/flowerbot_small.jpg b/res/drawable-sw600dp-nodpi/flowerbot_small.jpg
deleted file mode 100644
index 54778b9..0000000
--- a/res/drawable-sw600dp-nodpi/flowerbot_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/glowy_hex.jpg b/res/drawable-sw600dp-nodpi/glowy_hex.jpg
deleted file mode 100644
index b007bfd..0000000
--- a/res/drawable-sw600dp-nodpi/glowy_hex.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/glowy_hex_small.jpg b/res/drawable-sw600dp-nodpi/glowy_hex_small.jpg
deleted file mode 100644
index bde365d..0000000
--- a/res/drawable-sw600dp-nodpi/glowy_hex_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/lotus.jpg b/res/drawable-sw600dp-nodpi/lotus.jpg
deleted file mode 100644
index 1933c20..0000000
--- a/res/drawable-sw600dp-nodpi/lotus.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/lotus_small.jpg b/res/drawable-sw600dp-nodpi/lotus_small.jpg
deleted file mode 100644
index 6b515ef..0000000
--- a/res/drawable-sw600dp-nodpi/lotus_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/village.jpg b/res/drawable-sw600dp-nodpi/village.jpg
deleted file mode 100644
index 480a07c..0000000
--- a/res/drawable-sw600dp-nodpi/village.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/village_small.jpg b/res/drawable-sw600dp-nodpi/village_small.jpg
deleted file mode 100644
index 8659904..0000000
--- a/res/drawable-sw600dp-nodpi/village_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg b/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg
new file mode 100644
index 0000000..fae9d4f
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg
new file mode 100644
index 0000000..f17d9e8
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg
new file mode 100644
index 0000000..d902912
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg
new file mode 100644
index 0000000..5875810
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg b/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg
new file mode 100644
index 0000000..96e3be5
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg
new file mode 100644
index 0000000..72513b4
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg b/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg
new file mode 100644
index 0000000..355286e
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg
new file mode 100644
index 0000000..781c2c7
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg b/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg
new file mode 100644
index 0000000..d192ebf
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg
new file mode 100644
index 0000000..3a1a9c1
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg b/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg
new file mode 100644
index 0000000..d7ddef4
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg
new file mode 100644
index 0000000..01092cc
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg b/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg
new file mode 100644
index 0000000..ecdf0be
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg
new file mode 100644
index 0000000..7faebc9
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg b/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg
new file mode 100644
index 0000000..c7c6c2b
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg
new file mode 100644
index 0000000..dad79a2
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg b/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg
new file mode 100644
index 0000000..543d118
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg
new file mode 100644
index 0000000..f37aab9
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg b/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg
new file mode 100644
index 0000000..283bf21
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg
new file mode 100644
index 0000000..482a832
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg
new file mode 100644
index 0000000..1529dce
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg
new file mode 100644
index 0000000..0b4cde7
--- /dev/null
+++ b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg
Binary files differ
diff --git a/res/values-hdpi/wallpapers.xml b/res/values-hdpi/wallpapers.xml
deleted file mode 100644
index 26961b3..0000000
--- a/res/values-hdpi/wallpapers.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
- <string-array name="wallpapers" translatable="false">
- <item>wallpaper_electric</item>
- <item>wallpaper_grass</item>
- <item>wallpaper_canyon</item>
- <item>wallpaper_monumentvalley</item>
- <item>wallpaper_tree</item>
- <item>wallpaper_zanzibar</item>
- <item>wallpaper_field</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_pcut</item>
- <item>wallpaper_bluedotgrid</item>
- <item>wallpaper_hazybluedots</item>
- <item>wallpaper_ropelights</item>
- <item>wallpaper_gray</item>
- <item>wallpaper_greengray</item>
- <item>wallpaper_lightgrad</item>
- </string-array>
-</resources>
diff --git a/res/values-mdpi/wallpapers.xml b/res/values-mdpi/wallpapers.xml
deleted file mode 100644
index 33039b0..0000000
--- a/res/values-mdpi/wallpapers.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
- <string-array name="wallpapers" translatable="false">
- <item>wallpaper_lake</item>
- <item>wallpaper_sunset</item>
- <item>wallpaper_beach</item>
- <item>wallpaper_snow_leopard</item>
- <item>wallpaper_path</item>
- <item>wallpaper_sunrise</item>
- <item>wallpaper_mountain</item>
- <item>wallpaper_road</item>
- <item>wallpaper_jellyfish</item>
- <item>wallpaper_zanzibar</item>
- <item>wallpaper_blue</item>
- <item>wallpaper_grey</item>
- <item>wallpaper_green</item>
- <item>wallpaper_pink</item>
- </string-array>
-</resources>
diff --git a/res/values-sw600dp/wallpapers.xml b/res/values-sw600dp/wallpapers.xml
index 85bb433..fb386f4 100644
--- a/res/values-sw600dp/wallpapers.xml
+++ b/res/values-sw600dp/wallpapers.xml
@@ -17,14 +17,16 @@
<resources>
<string-array name="wallpapers" translatable="false">
- <item>bluecrystal</item>
- <item>bluelinebots</item>
- <item>glowy_hex</item>
- <item>bots</item>
- <item>flowerbot</item>
- <item>bucky</item>
- <item>lotus</item>
- <item>city</item>
- <item>village</item>
+ <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>
</string-array>
</resources>
diff --git a/res/values-xhdpi/wallpapers.xml b/res/values/wallpapers.xml
similarity index 100%
rename from res/values-xhdpi/wallpapers.xml
rename to res/values/wallpapers.xml
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 0b93b66..15da501 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2225,21 +2225,19 @@
scaleAnim.setInterpolator(new Workspace.ZoomOutInterpolator());
scaleAnim.addUpdateListener(new LauncherAnimatorUpdateListener() {
public void onAnimationUpdate(float a, float b) {
- ((View) toView.getParent()).invalidate();
- toView.fastInvalidate();
- toView.setFastScaleX(a * scale + b * 1f);
- toView.setFastScaleY(a * scale + b * 1f);
+ toView.setScaleX(a * scale + b * 1f);
+ toView.setScaleY(a * scale + b * 1f);
}
});
toView.setVisibility(View.VISIBLE);
- toView.setFastAlpha(0f);
+ toView.setAlpha(0f);
ValueAnimator alphaAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(fadeDuration);
alphaAnim.setInterpolator(new DecelerateInterpolator(1.5f));
alphaAnim.addUpdateListener(new LauncherAnimatorUpdateListener() {
public void onAnimationUpdate(float a, float b) {
// don't need to invalidate because we do so above
- toView.setFastAlpha(a * 0f + b * 1f);
+ toView.setAlpha(a * 0f + b * 1f);
}
});
alphaAnim.setStartDelay(startDelay);
@@ -2350,9 +2348,8 @@
scaleAnim.setInterpolator(new Workspace.ZoomInInterpolator());
scaleAnim.addUpdateListener(new LauncherAnimatorUpdateListener() {
public void onAnimationUpdate(float a, float b) {
- ((View)fromView.getParent()).fastInvalidate();
- fromView.setFastScaleX(a * oldScaleX + b * scaleFactor);
- fromView.setFastScaleY(a * oldScaleY + b * scaleFactor);
+ fromView.setScaleX(a * oldScaleX + b * scaleFactor);
+ fromView.setScaleY(a * oldScaleY + b * scaleFactor);
}
});
final ValueAnimator alphaAnim = ValueAnimator.ofFloat(0f, 1f);
@@ -2360,8 +2357,7 @@
alphaAnim.setInterpolator(new AccelerateDecelerateInterpolator());
alphaAnim.addUpdateListener(new LauncherAnimatorUpdateListener() {
public void onAnimationUpdate(float a, float b) {
- // don't need to invalidate because we do so above
- fromView.setFastAlpha(a * 1f + b * 0f);
+ fromView.setAlpha(a * 1f + b * 0f);
}
});
if (fromView instanceof LauncherTransitionable) {
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index f4ba63c..2db03da 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -67,14 +67,20 @@
private static final float OVERSCROLL_ACCELERATE_FACTOR = 2;
private static final float OVERSCROLL_DAMP_FACTOR = 0.14f;
- private static final int MINIMUM_SNAP_VELOCITY = 2200;
- private static final int MIN_FLING_VELOCITY = 250;
+
private static final float RETURN_TO_ORIGINAL_PAGE_THRESHOLD = 0.33f;
// The page is moved more than halfway, automatically move to the next page on touch up.
private static final float SIGNIFICANT_MOVE_THRESHOLD = 0.4f;
- // the velocity at which a fling gesture will cause us to snap to the next page
- protected int mSnapVelocity = 500;
+ // The following constants need to be scaled based on density. The scaled versions will be
+ // assigned to the corresponding member variables below.
+ private static final int FLING_THRESHOLD_VELOCITY = 500;
+ private static final int MIN_SNAP_VELOCITY = 1500;
+ private static final int MIN_FLING_VELOCITY = 250;
+
+ protected int mFlingThresholdVelocity;
+ protected int mMinFlingVelocity;
+ protected int mMinSnapVelocity;
protected float mDensity;
protected float mSmoothingTime;
@@ -242,6 +248,10 @@
mPagingTouchSlop = configuration.getScaledPagingTouchSlop();
mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
mDensity = getResources().getDisplayMetrics().density;
+
+ mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);
+ mMinFlingVelocity = (int) (MIN_FLING_VELOCITY * mDensity);
+ mMinSnapVelocity = (int) (MIN_SNAP_VELOCITY * mDensity);
}
public void setPageSwitchListener(PageSwitchListener pageSwitchListener) {
@@ -1208,12 +1218,11 @@
final int pageWidth = getScaledMeasuredWidth(getPageAt(mCurrentPage));
boolean isSignificantMove = Math.abs(deltaX) > pageWidth *
SIGNIFICANT_MOVE_THRESHOLD;
- final int snapVelocity = mSnapVelocity;
mTotalMotionX += Math.abs(mLastMotionX + mLastMotionXRemainder - x);
boolean isFling = mTotalMotionX > MIN_LENGTH_FOR_FLING &&
- Math.abs(velocityX) > snapVelocity;
+ Math.abs(velocityX) > mFlingThresholdVelocity;
// In the case that the page is moved far to one direction and then is flung
// in the opposite direction, we use a threshold to determine whether we should
@@ -1434,7 +1443,7 @@
int delta = newX - mUnboundedScrollX;
int duration = 0;
- if (Math.abs(velocity) < MIN_FLING_VELOCITY) {
+ if (Math.abs(velocity) < mMinFlingVelocity) {
// If the velocity is low enough, then treat this more as an automatic page advance
// as opposed to an apparent physical response to flinging
snapToPage(whichPage, PAGE_SNAP_ANIMATION_DURATION);
@@ -1450,7 +1459,7 @@
distanceInfluenceForSnapDuration(distanceRatio);
velocity = Math.abs(velocity);
- velocity = Math.max(MINIMUM_SNAP_VELOCITY, velocity);
+ velocity = Math.max(mMinSnapVelocity, velocity);
// we want the page's snap velocity to approximately match the velocity at which the
// user flings, so we scale the duration by a value near to the derivative of the scroll
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 467cec0..fa3dfcb 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -94,6 +94,7 @@
private static final int BACKGROUND_FADE_OUT_DURATION = 350;
private static final int ADJACENT_SCREEN_DROP_DURATION = 300;
+ private static final int FLING_THRESHOLD_VELOCITY = 500;
// These animators are used to fade the children's outlines
private ObjectAnimator mChildrenOutlineFadeInAnimation;
@@ -409,13 +410,15 @@
}
};
- mSnapVelocity = 600;
mWallpaperOffset = new WallpaperOffsetInterpolator();
Display display = mLauncher.getWindowManager().getDefaultDisplay();
mDisplayWidth = display.getWidth();
mDisplayHeight = display.getHeight();
mWallpaperTravelWidth = (int) (mDisplayWidth *
wallpaperTravelToScreenWidthRatio(mDisplayWidth, mDisplayHeight));
+
+ mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);
+
}
@Override
