diff --git a/Android.mk b/Android.mk
index 6059a3f982..3bd20a7cd1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,12 +26,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, wallpaper_picker_src) \
     $(call all-renderscript-files-under, src) \
     $(call all-proto-files-under, protos)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b2c5266fa2..c1323951be 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,8 +50,6 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png b/res/drawable-hdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
rename to res/drawable-hdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_images.png b/res/drawable-hdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/ic_images.png
rename to res/drawable-hdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png b/res/drawable-hdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
rename to res/drawable-hdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png b/res/drawable-hdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
rename to res/drawable-hdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png b/res/drawable-hdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
rename to res/drawable-hdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png b/res/drawable-hdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
rename to res/drawable-hdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png b/res/drawable-hdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
rename to res/drawable-hdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png b/res/drawable-mdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
rename to res/drawable-mdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_images.png b/res/drawable-mdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/ic_images.png
rename to res/drawable-mdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png b/res/drawable-mdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
rename to res/drawable-mdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png b/res/drawable-mdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
rename to res/drawable-mdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png b/res/drawable-mdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
rename to res/drawable-mdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png b/res/drawable-mdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
rename to res/drawable-mdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png b/res/drawable-mdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
rename to res/drawable-mdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png b/res/drawable-xhdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
rename to res/drawable-xhdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_images.png b/res/drawable-xhdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/ic_images.png
rename to res/drawable-xhdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png b/res/drawable-xhdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
rename to res/drawable-xhdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png b/res/drawable-xhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
rename to res/drawable-xhdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png b/res/drawable-xhdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
rename to res/drawable-xhdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png b/res/drawable-xhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
rename to res/drawable-xhdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png b/res/drawable-xhdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
rename to res/drawable-xhdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/ic_images.png b/res/drawable-xxhdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/ic_images.png
rename to res/drawable-xxhdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png b/res/drawable-xxhdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
rename to res/drawable-xxhdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png b/res/drawable-xxhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
rename to res/drawable-xxhdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png b/res/drawable-xxhdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
rename to res/drawable-xxhdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png b/res/drawable-xxhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
rename to res/drawable-xxhdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png b/res/drawable-xxhdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
rename to res/drawable-xxhdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml b/res/drawable/wallpaper_tile_fg.xml
similarity index 100%
rename from wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
rename to res/drawable/wallpaper_tile_fg.xml
diff --git a/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml b/res/layout/actionbar_set_wallpaper.xml
similarity index 100%
rename from wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
rename to res/layout/actionbar_set_wallpaper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_cropper.xml b/res/layout/wallpaper_cropper.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_cropper.xml
rename to res/layout/wallpaper_cropper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker.xml
rename to res/layout/wallpaper_picker.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml b/res/layout/wallpaper_picker_image_picker_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
rename to res/layout/wallpaper_picker_image_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_item.xml
rename to res/layout/wallpaper_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml b/res/layout/wallpaper_picker_live_wallpaper_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
rename to res/layout/wallpaper_picker_live_wallpaper_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml b/res/layout/wallpaper_picker_third_party_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
rename to res/layout/wallpaper_picker_third_party_item.xml
diff --git a/wallpaper_picker_res/menu/cab_delete_wallpapers.xml b/res/menu/cab_delete_wallpapers.xml
similarity index 100%
rename from wallpaper_picker_res/menu/cab_delete_wallpapers.xml
rename to res/menu/cab_delete_wallpapers.xml
diff --git a/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png b/res/mipmap-hdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
rename to res/mipmap-hdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png b/res/mipmap-mdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
rename to res/mipmap-mdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
rename to res/mipmap-xhdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
rename to res/mipmap-xxhdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/values-nodpi/wallpapers.xml b/res/values-nodpi/wallpapers.xml
similarity index 100%
rename from wallpaper_picker_res/values-nodpi/wallpapers.xml
rename to res/values-nodpi/wallpapers.xml
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 9ae155b3cc..01227e1470 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -21,6 +21,10 @@
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
 
+    <!-- dimensions for the wallpaper picker wallpaper thumbnail width -->
+    <dimen name="wallpaper_chooser_grid_width">196dp</dimen>
+    <dimen name="wallpaper_chooser_grid_height">140dp</dimen>
+
     <!-- When dragging items on the workspace, the number of dps by which the position of
      the drag view should be offset from the position of the original view. -->
     <dimen name="dragViewOffsetX">0dp</dimen>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index e1f9ab45af..9738a124b7 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -51,6 +51,12 @@
     </style>
 
 <!-- Workspace -->
+    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
     <style name="TabIndicator.AppsCustomize">
         <item name="android:paddingStart">32dp</item>
         <item name="android:paddingEnd">32dp</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ffee05f18e..c073903803 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,6 +32,7 @@
     <color name="workspace_icon_text_color">#FFF</color>
 
     <color name="apps_customize_icon_text_color">#FFF</color>
+    <color name="wallpaper_picker_translucent_gray">#66000000</color>
     <color name="folder_items_text_color">#FF333333</color>
     <color name="folder_items_glow_color">#FFCCCCCC</color>
     <color name="outline_color">#FFFFFFFF</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 28b6a5bcce..c86fe314df 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,6 +27,11 @@
     <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
     <dimen name="dynamic_grid_overview_bar_max_width">280dp</dimen>
 
+<!-- Wallpaper picker -->
+    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
+    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
+    <dimen name="wallpaperItemIconSize">32dp</dimen>
+
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
     <dimen name="folderClingMarginTop">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 361be7b3cc..30f4d8fd33 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,6 +28,38 @@
     <string name="uid_name">Android Core Apps</string>
     <!-- Default folder name -->
     <string name="folder_name"></string>
+    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+    <string name="wallpaper_instructions">Set wallpaper</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper picker cannot load it -->
+    <string name="image_load_fail">Coudn\'t load image</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
+    <!-- Shown when wallpapers are selected in Wallpaper picker -->
+    <!-- String indicating how many media item(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+    <plurals name="number_of_items_selected">
+        <item quantity="zero">%1$d selected</item>
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
+         e.g. "Wallpaper 3 of 10" -->
+    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
+    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
+    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
+
+    <!-- Label on button to delete wallpaper(s) -->
+    <string name="wallpaper_delete">Delete</string>
+    <!-- Label on button in Wallpaper Picker to pick an image -->
+    <string name="pick_image">Pick image</string>
+    <!-- Option in "Select wallpaper from" dialog box -->
+    <string name="pick_wallpaper">Wallpapers</string>
+    <!-- Title of activity for cropping wallpapers -->
+    <string name="crop_wallpaper">Crop wallpaper</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
     <string name="activity_not_found">App isn\'t installed.</string>
     <!--  Labels for the tabs in the customize drawer -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4aad5ebfaf..8226915ddf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,6 +18,23 @@
 -->
 
 <resources>
+    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
+        <item name="android:displayOptions">showCustom</item>
+        <item name="android:background">#88000000</item>
+    </style>
+
+    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
     <style name="ClingButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/wallpaper_picker_src/android/util/Pools.java b/src/android/util/Pools.java
similarity index 100%
rename from wallpaper_picker_src/android/util/Pools.java
rename to src/android/util/Pools.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java b/src/com/android/gallery3d/common/BitmapUtils.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
rename to src/com/android/gallery3d/common/BitmapUtils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/Utils.java b/src/com/android/gallery3d/common/Utils.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/common/Utils.java
rename to src/com/android/gallery3d/common/Utils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java b/src/com/android/gallery3d/exif/ByteBufferInputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
rename to src/com/android/gallery3d/exif/ByteBufferInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java b/src/com/android/gallery3d/exif/CountedDataInputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
rename to src/com/android/gallery3d/exif/CountedDataInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java b/src/com/android/gallery3d/exif/ExifData.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
rename to src/com/android/gallery3d/exif/ExifData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java b/src/com/android/gallery3d/exif/ExifInterface.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
rename to src/com/android/gallery3d/exif/ExifInterface.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
rename to src/com/android/gallery3d/exif/ExifInvalidFormatException.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java b/src/com/android/gallery3d/exif/ExifModifier.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
rename to src/com/android/gallery3d/exif/ExifModifier.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java b/src/com/android/gallery3d/exif/ExifOutputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
rename to src/com/android/gallery3d/exif/ExifOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java b/src/com/android/gallery3d/exif/ExifParser.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
rename to src/com/android/gallery3d/exif/ExifParser.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java b/src/com/android/gallery3d/exif/ExifReader.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
rename to src/com/android/gallery3d/exif/ExifReader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java b/src/com/android/gallery3d/exif/ExifTag.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
rename to src/com/android/gallery3d/exif/ExifTag.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java b/src/com/android/gallery3d/exif/IfdData.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
rename to src/com/android/gallery3d/exif/IfdData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java b/src/com/android/gallery3d/exif/IfdId.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
rename to src/com/android/gallery3d/exif/IfdId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java b/src/com/android/gallery3d/exif/JpegHeader.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
rename to src/com/android/gallery3d/exif/JpegHeader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
rename to src/com/android/gallery3d/exif/OrderedDataOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java b/src/com/android/gallery3d/exif/Rational.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
rename to src/com/android/gallery3d/exif/Rational.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java b/src/com/android/gallery3d/glrenderer/BasicTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
rename to src/com/android/gallery3d/glrenderer/BasicTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java b/src/com/android/gallery3d/glrenderer/BitmapTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
rename to src/com/android/gallery3d/glrenderer/BitmapTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java b/src/com/android/gallery3d/glrenderer/GLCanvas.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
rename to src/com/android/gallery3d/glrenderer/GLCanvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/src/com/android/gallery3d/glrenderer/GLES20Canvas.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
rename to src/com/android/gallery3d/glrenderer/GLES20Canvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rename to src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java b/src/com/android/gallery3d/glrenderer/GLId.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
rename to src/com/android/gallery3d/glrenderer/GLId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java b/src/com/android/gallery3d/glrenderer/GLPaint.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
rename to src/com/android/gallery3d/glrenderer/GLPaint.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java b/src/com/android/gallery3d/glrenderer/RawTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
rename to src/com/android/gallery3d/glrenderer/RawTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java b/src/com/android/gallery3d/glrenderer/Texture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
rename to src/com/android/gallery3d/glrenderer/Texture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java b/src/com/android/gallery3d/glrenderer/UploadedTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
rename to src/com/android/gallery3d/glrenderer/UploadedTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java b/src/com/android/gallery3d/util/IntArray.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
rename to src/com/android/gallery3d/util/IntArray.java
diff --git a/wallpaper_picker_src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/CropView.java
rename to src/com/android/launcher3/CropView.java
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
rename to src/com/android/launcher3/WallpaperCropActivity.java
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
rename to src/com/android/launcher3/WallpaperPickerActivity.java
diff --git a/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java b/src/com/android/photos/BitmapRegionTileSource.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
rename to src/com/android/photos/BitmapRegionTileSource.java
diff --git a/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java b/src/com/android/photos/views/BlockingGLTextureView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
rename to src/com/android/photos/views/BlockingGLTextureView.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java b/src/com/android/photos/views/TiledImageRenderer.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
rename to src/com/android/photos/views/TiledImageRenderer.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageView.java b/src/com/android/photos/views/TiledImageView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/TiledImageView.java
rename to src/com/android/photos/views/TiledImageView.java
diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/wallpaper_picker_res/values-sw720dp/dimens.xml
deleted file mode 100644
index 9ae155b3cc..0000000000
--- a/wallpaper_picker_res/values-sw720dp/dimens.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<resources>
-    <dimen name="app_icon_size">72dp</dimen>
-
-<!-- QSB -->
-    <dimen name="toolbar_button_vertical_padding">8dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
-
-    <!-- When dragging items on the workspace, the number of dps by which the position of
-     the drag view should be offset from the position of the original view. -->
-    <dimen name="dragViewOffsetX">0dp</dimen>
-    <dimen name="dragViewOffsetY">0dp</dimen>
-</resources>
diff --git a/wallpaper_picker_res/values-sw720dp/styles.xml b/wallpaper_picker_res/values-sw720dp/styles.xml
deleted file mode 100644
index 91078517db..0000000000
--- a/wallpaper_picker_res/values-sw720dp/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2013 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.
-*/
--->
-
-<resources>
-    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-</resources>
diff --git a/wallpaper_picker_res/values/colors.xml b/wallpaper_picker_res/values/colors.xml
deleted file mode 100644
index adae7cff6f..0000000000
--- a/wallpaper_picker_res/values/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2013, 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.
-*/
--->
-<resources>
-    <color name="wallpaper_picker_translucent_gray">#66000000</color>
-</resources>
diff --git a/wallpaper_picker_res/values/dimens.xml b/wallpaper_picker_res/values/dimens.xml
deleted file mode 100644
index 0447c6d1f7..0000000000
--- a/wallpaper_picker_res/values/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<resources>
-<!-- Wallpaper picker -->
-    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
-    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
-    <dimen name="wallpaperItemIconSize">32dp</dimen>
-</resources>
diff --git a/wallpaper_picker_res/values/strings.xml b/wallpaper_picker_res/values/strings.xml
deleted file mode 100644
index 1ee3513f90..0000000000
--- a/wallpaper_picker_res/values/strings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2013 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.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
-    <string name="wallpaper_instructions">Set wallpaper</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper picker cannot load it -->
-    <string name="image_load_fail">Coudn\'t load image</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper cropper cannot load it. The user will
-         usually see this when using another app and trying to set
-         an image as the wallpaper -->
-    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
-    <!-- Shown when wallpapers are selected in Wallpaper picker -->
-    <!-- String indicating how many media item(s) is(are) selected
-            eg. 1 selected [CHAR LIMIT=30] -->
-    <plurals name="number_of_items_selected">
-        <item quantity="zero">%1$d selected</item>
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
-         e.g. "Wallpaper 3 of 10" -->
-    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
-    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
-    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
-
-    <!-- Label on button to delete wallpaper(s) -->
-    <string name="wallpaper_delete">Delete</string>
-    <!-- Label on button in Wallpaper Picker to pick an image -->
-    <string name="pick_image">Pick image</string>
-    <!-- Option in "Select wallpaper from" dialog box -->
-    <string name="pick_wallpaper">Wallpapers</string>
-    <!-- Title of activity for cropping wallpapers -->
-    <string name="crop_wallpaper">Crop wallpaper</string>
-</resources>
diff --git a/wallpaper_picker_res/values/styles.xml b/wallpaper_picker_res/values/styles.xml
deleted file mode 100644
index 0e48ddac43..0000000000
--- a/wallpaper_picker_res/values/styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2013 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.
-*/
--->
-
-<resources>
-    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
-        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
-        <item name="android:displayOptions">showCustom</item>
-        <item name="android:background">#88000000</item>
-    </style>
-
-    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-</resources>