From 96749c13218aa1b783709dc82a4e16657ce9753f Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 11 Dec 2013 15:41:28 +0100
Subject: Revert "Revert "Move wallpaper picker code to a separate directory""

This reverts commit 39de459a8621abfc91382ce7b4cdd37d09aaac12.
---
 res/drawable-hdpi/ic_actionbar_accept.png          | Bin 1335 -> 0 bytes
 res/drawable-hdpi/ic_images.png                    | Bin 1935 -> 0 bytes
 res/drawable-hdpi/tile_picker_focused.9.png        | Bin 168 -> 0 bytes
 res/drawable-hdpi/tile_picker_pressed.9.png        | Bin 144 -> 0 bytes
 res/drawable-hdpi/tile_picker_selected.9.png       | Bin 165 -> 0 bytes
 res/drawable-hdpi/tile_shadow_bottom.9.png         | Bin 159 -> 0 bytes
 res/drawable-hdpi/tile_shadow_top.9.png            | Bin 148 -> 0 bytes
 res/drawable-mdpi/ic_actionbar_accept.png          | Bin 1191 -> 0 bytes
 res/drawable-mdpi/ic_images.png                    | Bin 1332 -> 0 bytes
 res/drawable-mdpi/tile_picker_focused.9.png        | Bin 165 -> 0 bytes
 res/drawable-mdpi/tile_picker_pressed.9.png        | Bin 142 -> 0 bytes
 res/drawable-mdpi/tile_picker_selected.9.png       | Bin 159 -> 0 bytes
 res/drawable-mdpi/tile_shadow_bottom.9.png         | Bin 140 -> 0 bytes
 res/drawable-mdpi/tile_shadow_top.9.png            | Bin 138 -> 0 bytes
 res/drawable-xhdpi/ic_actionbar_accept.png         | Bin 1599 -> 0 bytes
 res/drawable-xhdpi/ic_images.png                   | Bin 2480 -> 0 bytes
 res/drawable-xhdpi/tile_picker_focused.9.png       | Bin 174 -> 0 bytes
 res/drawable-xhdpi/tile_picker_pressed.9.png       | Bin 147 -> 0 bytes
 res/drawable-xhdpi/tile_picker_selected.9.png      | Bin 167 -> 0 bytes
 res/drawable-xhdpi/tile_shadow_bottom.9.png        | Bin 164 -> 0 bytes
 res/drawable-xhdpi/tile_shadow_top.9.png           | Bin 151 -> 0 bytes
 res/drawable-xxhdpi/ic_images.png                  | Bin 2097 -> 0 bytes
 res/drawable-xxhdpi/tile_picker_focused.9.png      | Bin 189 -> 0 bytes
 res/drawable-xxhdpi/tile_picker_pressed.9.png      | Bin 154 -> 0 bytes
 res/drawable-xxhdpi/tile_picker_selected.9.png     | Bin 175 -> 0 bytes
 res/drawable-xxhdpi/tile_shadow_bottom.9.png       | Bin 185 -> 0 bytes
 res/drawable-xxhdpi/tile_shadow_top.9.png          | Bin 169 -> 0 bytes
 res/drawable/wallpaper_tile_fg.xml                 |  23 ------
 res/layout/actionbar_set_wallpaper.xml             |  34 ---------
 res/layout/wallpaper_cropper.xml                   |  39 -----------
 res/layout/wallpaper_picker.xml                    |  77 ---------------------
 res/layout/wallpaper_picker_image_picker_item.xml  |  42 -----------
 res/layout/wallpaper_picker_item.xml               |  30 --------
 .../wallpaper_picker_live_wallpaper_item.xml       |  49 -------------
 res/layout/wallpaper_picker_third_party_item.xml   |  40 -----------
 res/menu/cab_delete_wallpapers.xml                 |  27 --------
 res/mipmap-hdpi/ic_launcher_wallpaper.png          | Bin 4418 -> 0 bytes
 res/mipmap-mdpi/ic_launcher_wallpaper.png          | Bin 2871 -> 0 bytes
 res/mipmap-xhdpi/ic_launcher_wallpaper.png         | Bin 6061 -> 0 bytes
 res/mipmap-xxhdpi/ic_launcher_wallpaper.png        | Bin 7596 -> 0 bytes
 res/values-nodpi/wallpapers.xml                    |  21 ------
 res/values-sw720dp/dimens.xml                      |   4 --
 res/values-sw720dp/styles.xml                      |   6 --
 res/values/colors.xml                              |   1 -
 res/values/dimens.xml                              |   5 --
 res/values/strings.xml                             |  32 ---------
 res/values/styles.xml                              |  17 -----
 47 files changed, 447 deletions(-)
 delete mode 100755 res/drawable-hdpi/ic_actionbar_accept.png
 delete mode 100644 res/drawable-hdpi/ic_images.png
 delete mode 100644 res/drawable-hdpi/tile_picker_focused.9.png
 delete mode 100644 res/drawable-hdpi/tile_picker_pressed.9.png
 delete mode 100644 res/drawable-hdpi/tile_picker_selected.9.png
 delete mode 100644 res/drawable-hdpi/tile_shadow_bottom.9.png
 delete mode 100644 res/drawable-hdpi/tile_shadow_top.9.png
 delete mode 100755 res/drawable-mdpi/ic_actionbar_accept.png
 delete mode 100644 res/drawable-mdpi/ic_images.png
 delete mode 100644 res/drawable-mdpi/tile_picker_focused.9.png
 delete mode 100644 res/drawable-mdpi/tile_picker_pressed.9.png
 delete mode 100644 res/drawable-mdpi/tile_picker_selected.9.png
 delete mode 100644 res/drawable-mdpi/tile_shadow_bottom.9.png
 delete mode 100644 res/drawable-mdpi/tile_shadow_top.9.png
 delete mode 100755 res/drawable-xhdpi/ic_actionbar_accept.png
 delete mode 100644 res/drawable-xhdpi/ic_images.png
 delete mode 100644 res/drawable-xhdpi/tile_picker_focused.9.png
 delete mode 100644 res/drawable-xhdpi/tile_picker_pressed.9.png
 delete mode 100644 res/drawable-xhdpi/tile_picker_selected.9.png
 delete mode 100644 res/drawable-xhdpi/tile_shadow_bottom.9.png
 delete mode 100644 res/drawable-xhdpi/tile_shadow_top.9.png
 delete mode 100644 res/drawable-xxhdpi/ic_images.png
 delete mode 100644 res/drawable-xxhdpi/tile_picker_focused.9.png
 delete mode 100644 res/drawable-xxhdpi/tile_picker_pressed.9.png
 delete mode 100644 res/drawable-xxhdpi/tile_picker_selected.9.png
 delete mode 100644 res/drawable-xxhdpi/tile_shadow_bottom.9.png
 delete mode 100644 res/drawable-xxhdpi/tile_shadow_top.9.png
 delete mode 100644 res/drawable/wallpaper_tile_fg.xml
 delete mode 100644 res/layout/actionbar_set_wallpaper.xml
 delete mode 100644 res/layout/wallpaper_cropper.xml
 delete mode 100644 res/layout/wallpaper_picker.xml
 delete mode 100644 res/layout/wallpaper_picker_image_picker_item.xml
 delete mode 100644 res/layout/wallpaper_picker_item.xml
 delete mode 100644 res/layout/wallpaper_picker_live_wallpaper_item.xml
 delete mode 100644 res/layout/wallpaper_picker_third_party_item.xml
 delete mode 100644 res/menu/cab_delete_wallpapers.xml
 delete mode 100644 res/mipmap-hdpi/ic_launcher_wallpaper.png
 delete mode 100644 res/mipmap-mdpi/ic_launcher_wallpaper.png
 delete mode 100644 res/mipmap-xhdpi/ic_launcher_wallpaper.png
 delete mode 100644 res/mipmap-xxhdpi/ic_launcher_wallpaper.png
 delete mode 100644 res/values-nodpi/wallpapers.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_actionbar_accept.png b/res/drawable-hdpi/ic_actionbar_accept.png
deleted file mode 100755
index 53cf6877e..000000000
Binary files a/res/drawable-hdpi/ic_actionbar_accept.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_images.png b/res/drawable-hdpi/ic_images.png
deleted file mode 100644
index 0003c6c65..000000000
Binary files a/res/drawable-hdpi/ic_images.png and /dev/null differ
diff --git a/res/drawable-hdpi/tile_picker_focused.9.png b/res/drawable-hdpi/tile_picker_focused.9.png
deleted file mode 100644
index c72d6a2c6..000000000
Binary files a/res/drawable-hdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/tile_picker_pressed.9.png b/res/drawable-hdpi/tile_picker_pressed.9.png
deleted file mode 100644
index 44c65ac3c..000000000
Binary files a/res/drawable-hdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/tile_picker_selected.9.png b/res/drawable-hdpi/tile_picker_selected.9.png
deleted file mode 100644
index 461bacbcb..000000000
Binary files a/res/drawable-hdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/tile_shadow_bottom.9.png b/res/drawable-hdpi/tile_shadow_bottom.9.png
deleted file mode 100644
index e80558bad..000000000
Binary files a/res/drawable-hdpi/tile_shadow_bottom.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/tile_shadow_top.9.png b/res/drawable-hdpi/tile_shadow_top.9.png
deleted file mode 100644
index 7e93865e7..000000000
Binary files a/res/drawable-hdpi/tile_shadow_top.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_actionbar_accept.png b/res/drawable-mdpi/ic_actionbar_accept.png
deleted file mode 100755
index 35cda8e11..000000000
Binary files a/res/drawable-mdpi/ic_actionbar_accept.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_images.png b/res/drawable-mdpi/ic_images.png
deleted file mode 100644
index aabc1237a..000000000
Binary files a/res/drawable-mdpi/ic_images.png and /dev/null differ
diff --git a/res/drawable-mdpi/tile_picker_focused.9.png b/res/drawable-mdpi/tile_picker_focused.9.png
deleted file mode 100644
index 13b325b87..000000000
Binary files a/res/drawable-mdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/tile_picker_pressed.9.png b/res/drawable-mdpi/tile_picker_pressed.9.png
deleted file mode 100644
index 4e8196d36..000000000
Binary files a/res/drawable-mdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/tile_picker_selected.9.png b/res/drawable-mdpi/tile_picker_selected.9.png
deleted file mode 100644
index eee69ec6d..000000000
Binary files a/res/drawable-mdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/tile_shadow_bottom.9.png b/res/drawable-mdpi/tile_shadow_bottom.9.png
deleted file mode 100644
index d95787bac..000000000
Binary files a/res/drawable-mdpi/tile_shadow_bottom.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/tile_shadow_top.9.png b/res/drawable-mdpi/tile_shadow_top.9.png
deleted file mode 100644
index 8da913cc4..000000000
Binary files a/res/drawable-mdpi/tile_shadow_top.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_actionbar_accept.png b/res/drawable-xhdpi/ic_actionbar_accept.png
deleted file mode 100755
index b52dc3701..000000000
Binary files a/res/drawable-xhdpi/ic_actionbar_accept.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_images.png b/res/drawable-xhdpi/ic_images.png
deleted file mode 100644
index 3f21faf8f..000000000
Binary files a/res/drawable-xhdpi/ic_images.png and /dev/null differ
diff --git a/res/drawable-xhdpi/tile_picker_focused.9.png b/res/drawable-xhdpi/tile_picker_focused.9.png
deleted file mode 100644
index 279e85963..000000000
Binary files a/res/drawable-xhdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/tile_picker_pressed.9.png b/res/drawable-xhdpi/tile_picker_pressed.9.png
deleted file mode 100644
index abe0e0080..000000000
Binary files a/res/drawable-xhdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/tile_picker_selected.9.png b/res/drawable-xhdpi/tile_picker_selected.9.png
deleted file mode 100644
index b047591ac..000000000
Binary files a/res/drawable-xhdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/tile_shadow_bottom.9.png b/res/drawable-xhdpi/tile_shadow_bottom.9.png
deleted file mode 100644
index 81571f3b7..000000000
Binary files a/res/drawable-xhdpi/tile_shadow_bottom.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/tile_shadow_top.9.png b/res/drawable-xhdpi/tile_shadow_top.9.png
deleted file mode 100644
index 8503a59fe..000000000
Binary files a/res/drawable-xhdpi/tile_shadow_top.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_images.png b/res/drawable-xxhdpi/ic_images.png
deleted file mode 100644
index d00db9a00..000000000
Binary files a/res/drawable-xxhdpi/ic_images.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/tile_picker_focused.9.png b/res/drawable-xxhdpi/tile_picker_focused.9.png
deleted file mode 100644
index 1004c14b8..000000000
Binary files a/res/drawable-xxhdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/tile_picker_pressed.9.png b/res/drawable-xxhdpi/tile_picker_pressed.9.png
deleted file mode 100644
index 9658444a1..000000000
Binary files a/res/drawable-xxhdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/tile_picker_selected.9.png b/res/drawable-xxhdpi/tile_picker_selected.9.png
deleted file mode 100644
index a3cd30369..000000000
Binary files a/res/drawable-xxhdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/tile_shadow_bottom.9.png b/res/drawable-xxhdpi/tile_shadow_bottom.9.png
deleted file mode 100644
index 55250f041..000000000
Binary files a/res/drawable-xxhdpi/tile_shadow_bottom.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/tile_shadow_top.9.png b/res/drawable-xxhdpi/tile_shadow_top.9.png
deleted file mode 100644
index 3f2263364..000000000
Binary files a/res/drawable-xxhdpi/tile_shadow_top.9.png and /dev/null differ
diff --git a/res/drawable/wallpaper_tile_fg.xml b/res/drawable/wallpaper_tile_fg.xml
deleted file mode 100644
index c299f32c6..000000000
--- a/res/drawable/wallpaper_tile_fg.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/tile_picker_selected" />
-    <item android:state_focused="true" android:drawable="@drawable/tile_picker_focused" />
-    <item android:state_pressed="true" android:drawable="@drawable/tile_picker_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/tile_picker_selected" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/layout/actionbar_set_wallpaper.xml b/res/layout/actionbar_set_wallpaper.xml
deleted file mode 100644
index 1622742a5..000000000
--- a/res/layout/actionbar_set_wallpaper.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-*/
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="?android:actionButtonStyle"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    <TextView style="?android:actionBarTabTextStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|center_vertical"
-        android:paddingRight="20dp"
-        android:drawableLeft="@drawable/ic_actionbar_accept"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical"
-        android:text="@string/wallpaper_instructions" />
-</FrameLayout>
diff --git a/res/layout/wallpaper_cropper.xml b/res/layout/wallpaper_cropper.xml
deleted file mode 100644
index abb860898..000000000
--- a/res/layout/wallpaper_cropper.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-*/
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wallpaper_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <com.android.launcher3.CropView
-        android:id="@+id/cropView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <ProgressBar
-        android:id="@+id/loading"
-        style="@android:style/Widget.Holo.ProgressBar.Large"
-        android:visibility="invisible"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"
-        android:indeterminateOnly="true"
-        android:background="@android:color/transparent" />
-</RelativeLayout>
diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml
deleted file mode 100644
index c36493d2f..000000000
--- a/res/layout/wallpaper_picker.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-*/
--->
-
-<com.android.launcher3.WallpaperRootView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wallpaper_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <com.android.launcher3.CropView
-        android:id="@+id/cropView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <ProgressBar
-        android:id="@+id/loading"
-        style="@android:style/Widget.Holo.ProgressBar.Large"
-        android:visibility="invisible"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"
-        android:indeterminateOnly="true"
-        android:background="@android:color/transparent" />
-    <LinearLayout
-        android:id="@+id/wallpaper_strip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical" >
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:background="@drawable/tile_shadow_top" />
-        <HorizontalScrollView
-            android:id="@+id/wallpaper_scroll_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <LinearLayout android:id="@+id/master_wallpaper_list"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-                <LinearLayout android:id="@+id/wallpaper_list"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" />
-                <LinearLayout android:id="@+id/live_wallpaper_list"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" />
-                <LinearLayout android:id="@+id/third_party_wallpaper_list"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" />
-            </LinearLayout>
-        </HorizontalScrollView>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:background="@drawable/tile_shadow_bottom" />
-    </LinearLayout>
-</com.android.launcher3.WallpaperRootView>
diff --git a/res/layout/wallpaper_picker_image_picker_item.xml b/res/layout/wallpaper_picker_image_picker_item.xml
deleted file mode 100644
index ae3c43d8e..000000000
--- a/res/layout/wallpaper_picker_image_picker_item.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<com.android.launcher3.CheckableFrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/wallpaperThumbnailWidth"
-    android:layout_height="@dimen/wallpaperThumbnailHeight"
-    android:focusable="true"
-    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
-    android:foreground="@drawable/wallpaper_tile_fg">
-    <ImageView
-        android:id="@+id/wallpaper_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/wallpaper_picker_translucent_gray"
-        android:scaleType="centerCrop" />
-    <TextView
-        android:id="@+id/wallpaper_item_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:text="@string/pick_image"
-        android:drawableTop="@drawable/ic_images"
-        android:drawablePadding="4dp"
-        android:textColor="@android:color/white"/>
-</com.android.launcher3.CheckableFrameLayout>
diff --git a/res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml
deleted file mode 100644
index 0ac8f97fb..000000000
--- a/res/layout/wallpaper_picker_item.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<com.android.launcher3.CheckableFrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/wallpaperThumbnailWidth"
-    android:layout_height="@dimen/wallpaperThumbnailHeight"
-    android:focusable="true"
-    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
-    android:foreground="@drawable/wallpaper_tile_fg">
-    <ImageView
-        android:id="@+id/wallpaper_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
-</com.android.launcher3.CheckableFrameLayout>
diff --git a/res/layout/wallpaper_picker_live_wallpaper_item.xml b/res/layout/wallpaper_picker_live_wallpaper_item.xml
deleted file mode 100644
index 29fdb1b82..000000000
--- a/res/layout/wallpaper_picker_live_wallpaper_item.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<com.android.launcher3.CheckableFrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/wallpaperThumbnailWidth"
-    android:layout_height="@dimen/wallpaperThumbnailHeight"
-    android:focusable="true"
-    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
-    android:foreground="@drawable/wallpaper_tile_fg">
-    <ImageView
-        android:id="@+id/wallpaper_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="@android:color/black"
-        android:scaleType="centerCrop" />
-    <ImageView
-        android:id="@+id/wallpaper_icon"
-        android:layout_width="@dimen/wallpaperItemIconSize"
-        android:layout_height="@dimen/wallpaperItemIconSize"
-        android:layout_gravity="center"
-        android:visibility="gone" />
-    <TextView
-        android:id="@+id/wallpaper_item_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="center"
-        android:padding="4dp"
-        android:layout_gravity="bottom"
-        android:background="@color/wallpaper_picker_translucent_gray"
-        android:textColor="@android:color/white"/>
-</com.android.launcher3.CheckableFrameLayout>
diff --git a/res/layout/wallpaper_picker_third_party_item.xml b/res/layout/wallpaper_picker_third_party_item.xml
deleted file mode 100644
index 68661bc00..000000000
--- a/res/layout/wallpaper_picker_third_party_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<com.android.launcher3.CheckableFrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/wallpaperThumbnailWidth"
-    android:layout_height="@dimen/wallpaperThumbnailHeight"
-    android:focusable="true"
-    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
-    android:foreground="@drawable/wallpaper_tile_fg">
-    <ImageView
-        android:id="@+id/wallpaper_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/wallpaper_picker_translucent_gray"
-        android:scaleType="centerCrop" />
-    <TextView
-        android:id="@+id/wallpaper_item_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:drawablePadding="4dp"
-        android:textColor="@android:color/white"/>
-</com.android.launcher3.CheckableFrameLayout>
diff --git a/res/menu/cab_delete_wallpapers.xml b/res/menu/cab_delete_wallpapers.xml
deleted file mode 100644
index 38ac5c4d6..000000000
--- a/res/menu/cab_delete_wallpapers.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-*/
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item
-     android:id="@+id/menu_delete"
-     android:title="@string/wallpaper_delete"
-     android:showAsAction="always"
-     android:icon="@android:drawable/ic_menu_delete" />
-</menu>
diff --git a/res/mipmap-hdpi/ic_launcher_wallpaper.png b/res/mipmap-hdpi/ic_launcher_wallpaper.png
deleted file mode 100644
index affee851d..000000000
Binary files a/res/mipmap-hdpi/ic_launcher_wallpaper.png and /dev/null differ
diff --git a/res/mipmap-mdpi/ic_launcher_wallpaper.png b/res/mipmap-mdpi/ic_launcher_wallpaper.png
deleted file mode 100644
index cb4443bdb..000000000
Binary files a/res/mipmap-mdpi/ic_launcher_wallpaper.png and /dev/null differ
diff --git a/res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png
deleted file mode 100644
index 60f8dceec..000000000
Binary files a/res/mipmap-xhdpi/ic_launcher_wallpaper.png and /dev/null differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
deleted file mode 100644
index 023fb5886..000000000
Binary files a/res/mipmap-xxhdpi/ic_launcher_wallpaper.png and /dev/null differ
diff --git a/res/values-nodpi/wallpapers.xml b/res/values-nodpi/wallpapers.xml
deleted file mode 100644
index 1e340e4b2..000000000
--- a/res/values-nodpi/wallpapers.xml
+++ /dev/null
@@ -1,21 +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">
-    </string-array>
-</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 01227e147..9ae155b3c 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -21,10 +21,6 @@
     <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 9738a124b..e1f9ab45a 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -51,12 +51,6 @@
     </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 c07390380..ffee05f18 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,6 @@
     <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 c86fe314d..28b6a5bcc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,11 +27,6 @@
     <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 30f4d8fd3..361be7b3c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,38 +28,6 @@
     <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 8226915dd..4aad5ebfa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,23 +18,6 @@
 -->
 
 <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>
-- 
cgit v1.2.3