diff --git a/res/drawable-mdpi/wallpaper_beach.jpg b/res/drawable-mdpi/wallpaper_beach.jpg
new file mode 100644
index 0000000..b502092
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_beach.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_beach_small.jpg b/res/drawable-mdpi/wallpaper_beach_small.jpg
new file mode 100644
index 0000000..46051cc
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_beach_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_blue.jpg b/res/drawable-mdpi/wallpaper_blue.jpg
new file mode 100644
index 0000000..0edd6bd
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_blue.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_blue_small.jpg b/res/drawable-mdpi/wallpaper_blue_small.jpg
new file mode 100644
index 0000000..5cf585a
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_blue_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_bluedotgrid.jpg b/res/drawable-mdpi/wallpaper_bluedotgrid.jpg
deleted file mode 100644
index 468edfe..0000000
--- a/res/drawable-mdpi/wallpaper_bluedotgrid.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_bluedotgrid_small.jpg b/res/drawable-mdpi/wallpaper_bluedotgrid_small.jpg
deleted file mode 100644
index 1ff9568..0000000
--- a/res/drawable-mdpi/wallpaper_bluedotgrid_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_brown.jpg b/res/drawable-mdpi/wallpaper_brown.jpg
deleted file mode 100644
index 9b7ef20..0000000
--- a/res/drawable-mdpi/wallpaper_brown.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_brown_small.jpg b/res/drawable-mdpi/wallpaper_brown_small.jpg
deleted file mode 100644
index e5b417e..0000000
--- a/res/drawable-mdpi/wallpaper_brown_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_canyon.jpg b/res/drawable-mdpi/wallpaper_canyon.jpg
deleted file mode 100644
index 1b129fd..0000000
--- a/res/drawable-mdpi/wallpaper_canyon.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_canyon_small.jpg b/res/drawable-mdpi/wallpaper_canyon_small.jpg
deleted file mode 100644
index fd4d72f..0000000
--- a/res/drawable-mdpi/wallpaper_canyon_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_cloud.jpg b/res/drawable-mdpi/wallpaper_cloud.jpg
deleted file mode 100644
index f3b5545..0000000
--- a/res/drawable-mdpi/wallpaper_cloud.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_cloud_small.jpg b/res/drawable-mdpi/wallpaper_cloud_small.jpg
deleted file mode 100644
index 0e4c14c..0000000
--- a/res/drawable-mdpi/wallpaper_cloud_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_desert.jpg b/res/drawable-mdpi/wallpaper_desert.jpg
deleted file mode 100644
index 47daa79..0000000
--- a/res/drawable-mdpi/wallpaper_desert.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_desert_small.jpg b/res/drawable-mdpi/wallpaper_desert_small.jpg
deleted file mode 100644
index 9252d36..0000000
--- a/res/drawable-mdpi/wallpaper_desert_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_despair.jpg b/res/drawable-mdpi/wallpaper_despair.jpg
deleted file mode 100644
index 57e8235..0000000
--- a/res/drawable-mdpi/wallpaper_despair.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_despair_small.jpg b/res/drawable-mdpi/wallpaper_despair_small.jpg
deleted file mode 100644
index fc8e3c6..0000000
--- a/res/drawable-mdpi/wallpaper_despair_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_electric.jpg b/res/drawable-mdpi/wallpaper_electric.jpg
deleted file mode 100644
index f7800af..0000000
--- a/res/drawable-mdpi/wallpaper_electric.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_electric_small.jpg b/res/drawable-mdpi/wallpaper_electric_small.jpg
deleted file mode 100644
index 66dd573..0000000
--- a/res/drawable-mdpi/wallpaper_electric_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_field.jpg b/res/drawable-mdpi/wallpaper_field.jpg
deleted file mode 100644
index 5bab9b5..0000000
--- a/res/drawable-mdpi/wallpaper_field.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_field_small.jpg b/res/drawable-mdpi/wallpaper_field_small.jpg
deleted file mode 100644
index 20d9a48..0000000
--- a/res/drawable-mdpi/wallpaper_field_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_galaxy.jpg b/res/drawable-mdpi/wallpaper_galaxy.jpg
deleted file mode 100644
index de0f3ff..0000000
--- a/res/drawable-mdpi/wallpaper_galaxy.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_galaxy_small.jpg b/res/drawable-mdpi/wallpaper_galaxy_small.jpg
deleted file mode 100644
index 69d48a2..0000000
--- a/res/drawable-mdpi/wallpaper_galaxy_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_goldengate.jpg b/res/drawable-mdpi/wallpaper_goldengate.jpg
deleted file mode 100644
index 2271091..0000000
--- a/res/drawable-mdpi/wallpaper_goldengate.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_goldengate_small.jpg b/res/drawable-mdpi/wallpaper_goldengate_small.jpg
deleted file mode 100644
index e9aca1e..0000000
--- a/res/drawable-mdpi/wallpaper_goldengate_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grass.jpg b/res/drawable-mdpi/wallpaper_grass.jpg
deleted file mode 100644
index e9dc541..0000000
--- a/res/drawable-mdpi/wallpaper_grass.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grass_night.jpg b/res/drawable-mdpi/wallpaper_grass_night.jpg
deleted file mode 100644
index b9c74c9..0000000
--- a/res/drawable-mdpi/wallpaper_grass_night.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grass_night_small.jpg b/res/drawable-mdpi/wallpaper_grass_night_small.jpg
deleted file mode 100644
index 353eb18..0000000
--- a/res/drawable-mdpi/wallpaper_grass_night_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grass_small.jpg b/res/drawable-mdpi/wallpaper_grass_small.jpg
deleted file mode 100644
index dc45738..0000000
--- a/res/drawable-mdpi/wallpaper_grass_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_gray.jpg b/res/drawable-mdpi/wallpaper_gray.jpg
deleted file mode 100644
index 913f053..0000000
--- a/res/drawable-mdpi/wallpaper_gray.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_gray_small.jpg b/res/drawable-mdpi/wallpaper_gray_small.jpg
deleted file mode 100644
index d083a74..0000000
--- a/res/drawable-mdpi/wallpaper_gray_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_green.jpg b/res/drawable-mdpi/wallpaper_green.jpg
new file mode 100644
index 0000000..36c9e08
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_green.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_green_small.jpg b/res/drawable-mdpi/wallpaper_green_small.jpg
new file mode 100644
index 0000000..d7c28ec
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_green_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_greengray.jpg b/res/drawable-mdpi/wallpaper_greengray.jpg
deleted file mode 100644
index 1f3c86c..0000000
--- a/res/drawable-mdpi/wallpaper_greengray.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_greengray_small.jpg b/res/drawable-mdpi/wallpaper_greengray_small.jpg
deleted file mode 100644
index ebf7066..0000000
--- a/res/drawable-mdpi/wallpaper_greengray_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grey.jpg b/res/drawable-mdpi/wallpaper_grey.jpg
new file mode 100644
index 0000000..ca48e6a
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_grey.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grey_small.jpg b/res/drawable-mdpi/wallpaper_grey_small.jpg
new file mode 100644
index 0000000..1734d2e
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_grey_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_hazybluedots.jpg b/res/drawable-mdpi/wallpaper_hazybluedots.jpg
deleted file mode 100644
index fe6aeb4..0000000
--- a/res/drawable-mdpi/wallpaper_hazybluedots.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg b/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
deleted file mode 100644
index c645dea..0000000
--- a/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish.jpg b/res/drawable-mdpi/wallpaper_jellyfish.jpg
new file mode 100644
index 0000000..659228b
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_jellyfish.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish_small.jpg b/res/drawable-mdpi/wallpaper_jellyfish_small.jpg
new file mode 100644
index 0000000..4e5d134
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_jellyfish_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lake.jpg b/res/drawable-mdpi/wallpaper_lake.jpg
new file mode 100644
index 0000000..5ba522f
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_lake.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lake_small.jpg b/res/drawable-mdpi/wallpaper_lake_small.jpg
new file mode 100644
index 0000000..36d56cc
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_lake_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lightgrad.jpg b/res/drawable-mdpi/wallpaper_lightgrad.jpg
deleted file mode 100644
index 35a45fa..0000000
--- a/res/drawable-mdpi/wallpaper_lightgrad.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lightgrad_small.jpg b/res/drawable-mdpi/wallpaper_lightgrad_small.jpg
deleted file mode 100644
index f909da7..0000000
--- a/res/drawable-mdpi/wallpaper_lightgrad_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_monumentvalley.jpg b/res/drawable-mdpi/wallpaper_monumentvalley.jpg
deleted file mode 100644
index 1bb5f2c..0000000
--- a/res/drawable-mdpi/wallpaper_monumentvalley.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_monumentvalley_small.jpg b/res/drawable-mdpi/wallpaper_monumentvalley_small.jpg
deleted file mode 100644
index 9ea3309..0000000
--- a/res/drawable-mdpi/wallpaper_monumentvalley_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_mountain.jpg b/res/drawable-mdpi/wallpaper_mountain.jpg
new file mode 100644
index 0000000..1376177
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_mountain.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_mountain_small.jpg b/res/drawable-mdpi/wallpaper_mountain_small.jpg
new file mode 100644
index 0000000..e2d5ac2
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_mountain_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexuspattern.jpg b/res/drawable-mdpi/wallpaper_nexuspattern.jpg
deleted file mode 100644
index 212a7b1..0000000
--- a/res/drawable-mdpi/wallpaper_nexuspattern.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexuspattern_small.jpg b/res/drawable-mdpi/wallpaper_nexuspattern_small.jpg
deleted file mode 100644
index 8e474a5..0000000
--- a/res/drawable-mdpi/wallpaper_nexuspattern_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexusrain.jpg b/res/drawable-mdpi/wallpaper_nexusrain.jpg
deleted file mode 100644
index 46c2971..0000000
--- a/res/drawable-mdpi/wallpaper_nexusrain.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexusrain_small.jpg b/res/drawable-mdpi/wallpaper_nexusrain_small.jpg
deleted file mode 100644
index a239339..0000000
--- a/res/drawable-mdpi/wallpaper_nexusrain_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 2856da0..0000000
--- a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexuswallpaper1_small.jpg b/res/drawable-mdpi/wallpaper_nexuswallpaper1_small.jpg
deleted file mode 100644
index 70882bb..0000000
--- a/res/drawable-mdpi/wallpaper_nexuswallpaper1_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_path.jpg b/res/drawable-mdpi/wallpaper_path.jpg
new file mode 100644
index 0000000..e1c98c0
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_path.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_path_small.jpg b/res/drawable-mdpi/wallpaper_path_small.jpg
new file mode 100644
index 0000000..f47d7a7
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_path_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pcut.jpg b/res/drawable-mdpi/wallpaper_pcut.jpg
deleted file mode 100644
index bb9914d..0000000
--- a/res/drawable-mdpi/wallpaper_pcut.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pcut_small.jpg b/res/drawable-mdpi/wallpaper_pcut_small.jpg
deleted file mode 100644
index bd19775..0000000
--- a/res/drawable-mdpi/wallpaper_pcut_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pink.jpg b/res/drawable-mdpi/wallpaper_pink.jpg
new file mode 100644
index 0000000..74403e5
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_pink.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pink_small.jpg b/res/drawable-mdpi/wallpaper_pink_small.jpg
new file mode 100644
index 0000000..42b1770
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_pink_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_road.jpg b/res/drawable-mdpi/wallpaper_road.jpg
new file mode 100644
index 0000000..3aaa639
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_road.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_road_small.jpg b/res/drawable-mdpi/wallpaper_road_small.jpg
new file mode 100644
index 0000000..0b0c390
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_road_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_ropelights.jpg b/res/drawable-mdpi/wallpaper_ropelights.jpg
deleted file mode 100644
index ca7862f..0000000
--- a/res/drawable-mdpi/wallpaper_ropelights.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_ropelights_small.jpg b/res/drawable-mdpi/wallpaper_ropelights_small.jpg
deleted file mode 100644
index ac6fb29..0000000
--- a/res/drawable-mdpi/wallpaper_ropelights_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
new file mode 100644
index 0000000..bcbc51e
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_snow_leopard.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg b/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg
new file mode 100644
index 0000000..99db5c6
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise.jpg b/res/drawable-mdpi/wallpaper_sunrise.jpg
new file mode 100644
index 0000000..4ee8d5d
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_sunrise.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise_small.jpg b/res/drawable-mdpi/wallpaper_sunrise_small.jpg
new file mode 100644
index 0000000..248b7e7
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_sunrise_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunset.jpg b/res/drawable-mdpi/wallpaper_sunset.jpg
new file mode 100644
index 0000000..bcfd8d4
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_sunset.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunset_small.jpg b/res/drawable-mdpi/wallpaper_sunset_small.jpg
new file mode 100644
index 0000000..d5e5add
--- /dev/null
+++ b/res/drawable-mdpi/wallpaper_sunset_small.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_tree.jpg b/res/drawable-mdpi/wallpaper_tree.jpg
deleted file mode 100644
index f998bea..0000000
--- a/res/drawable-mdpi/wallpaper_tree.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_tree_small.jpg b/res/drawable-mdpi/wallpaper_tree_small.jpg
deleted file mode 100644
index 425305a..0000000
--- a/res/drawable-mdpi/wallpaper_tree_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_x67.jpg b/res/drawable-mdpi/wallpaper_x67.jpg
deleted file mode 100644
index 400aa27..0000000
--- a/res/drawable-mdpi/wallpaper_x67.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_x67_small.jpg b/res/drawable-mdpi/wallpaper_x67_small.jpg
deleted file mode 100644
index 10e0faa..0000000
--- a/res/drawable-mdpi/wallpaper_x67_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar.jpg b/res/drawable-mdpi/wallpaper_zanzibar.jpg
index 9218895..fb13374 100644
--- a/res/drawable-mdpi/wallpaper_zanzibar.jpg
+++ b/res/drawable-mdpi/wallpaper_zanzibar.jpg
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg b/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
index affdc8c..700a7fe 100644
--- a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
+++ b/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
Binary files differ
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 7975df4..fadf736 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -14,20 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Replace with AllAppsView to use 2D version -->
-<com.android.launcher2.AllApps3D
-    xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:id="@+id/all_apps_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-
-    android:scrollbarStyle="outsideInset"
-    android:drawSelectorOnTop="false"
-    android:listSelector="@drawable/grid_selector"
-    android:verticalSpacing="10dip"
-    android:numColumns="4"
-    android:fadingEdgeLength="20dip"
-    android:padding="2dip"
-    android:cacheColorHint="#FF000000"
-    />
+<!-- switch to all_apps_3d on devices that support RenderScript -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <include layout="@layout/all_apps_2d" />
+</merge>
diff --git a/res/layout/all_apps_2d.xml b/res/layout/all_apps_2d.xml
new file mode 100644
index 0000000..f22b8ea
--- /dev/null
+++ b/res/layout/all_apps_2d.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     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.
+-->
+
+<!-- Sapphire gets 2D all apps view -->
+<com.android.launcher2.AllApps2D
+    xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:id="@+id/all_apps_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="2dip"
+    
+    >
+    <GridView android:id="@+id/all_apps_2d_grid"
+        android:tag="all_apps_2d_grid"
+        android:scrollbars="none"
+        android:drawSelectorOnTop="false"
+        android:listSelector="@drawable/grid_selector"
+        android:verticalSpacing="10dip"
+        android:numColumns="4"
+        android:fadingEdgeLength="48dip"
+        android:cacheColorHint="#FF000000"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="24dip"
+        android:layout_marginTop="8dip"
+        android:nextFocusDown="@+id/all_apps_2d_home"
+        />
+
+    <ImageButton android:id="@+id/all_apps_2d_home"
+        android:tag="all_apps_2d_home"
+        android:src="@drawable/home_button"
+        android:background="#00000000"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_width="wrap_content"
+        android:layout_height="64dip"
+        android:nextFocusUp="@+id/all_apps_2d_grid"
+        />
+
+</com.android.launcher2.AllApps2D>
diff --git a/res/layout/all_apps_3d.xml b/res/layout/all_apps_3d.xml
new file mode 100644
index 0000000..7975df4
--- /dev/null
+++ b/res/layout/all_apps_3d.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     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.
+-->
+
+<!-- Replace with AllAppsView to use 2D version -->
+<com.android.launcher2.AllApps3D
+    xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:id="@+id/all_apps_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    android:scrollbarStyle="outsideInset"
+    android:drawSelectorOnTop="false"
+    android:listSelector="@drawable/grid_selector"
+    android:verticalSpacing="10dip"
+    android:numColumns="4"
+    android:fadingEdgeLength="20dip"
+    android:padding="2dip"
+    android:cacheColorHint="#FF000000"
+    />
diff --git a/res/values-mdpi/wallpapers.xml b/res/values-mdpi/wallpapers.xml
new file mode 100644
index 0000000..33039b0
--- /dev/null
+++ b/res/values-mdpi/wallpapers.xml
@@ -0,0 +1,35 @@
+<?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/src/com/android/launcher2/WallpaperChooser.java b/src/com/android/launcher2/WallpaperChooser.java
index 11621ce..bf8ba2e 100644
--- a/src/com/android/launcher2/WallpaperChooser.java
+++ b/src/com/android/launcher2/WallpaperChooser.java
@@ -78,7 +78,11 @@
         mImages = new ArrayList<Integer>(24);
 
         final Resources resources = getResources();
-        final String packageName = getApplication().getPackageName();
+        // Context.getPackageName() may return the "original" package name,
+        // com.android.launcher2; Resources needs the real package name,
+        // com.android.launcher. So we ask Resources for what it thinks the
+        // package name should be.
+        final String packageName = resources.getResourcePackageName(R.array.wallpapers);
 
         addWallpapers(resources, packageName, R.array.wallpapers);
         addWallpapers(resources, packageName, R.array.extra_wallpapers);
@@ -95,6 +99,7 @@
                 if (thumbRes != 0) {
                     mThumbs.add(thumbRes);
                     mImages.add(res);
+                    // Log.d(TAG, "addWallpapers: [" + packageName + "]: " + extra + " (" + res + ")");
                 }
             }
         }