From 39de459a8621abfc91382ce7b4cdd37d09aaac12 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 10 Dec 2013 23:47:28 +0100
Subject: Revert "Move wallpaper picker code to a separate directory"

This reverts commit 8e88cb84781907afb7cca80581fea2277264fd2c.
---
 res/drawable-hdpi/ic_actionbar_accept.png          | Bin 0 -> 1335 bytes
 res/drawable-hdpi/ic_images.png                    | Bin 0 -> 1935 bytes
 res/drawable-hdpi/tile_picker_focused.9.png        | Bin 0 -> 168 bytes
 res/drawable-hdpi/tile_picker_pressed.9.png        | Bin 0 -> 144 bytes
 res/drawable-hdpi/tile_picker_selected.9.png       | Bin 0 -> 165 bytes
 res/drawable-hdpi/tile_shadow_bottom.9.png         | Bin 0 -> 159 bytes
 res/drawable-hdpi/tile_shadow_top.9.png            | Bin 0 -> 148 bytes
 res/drawable-mdpi/ic_actionbar_accept.png          | Bin 0 -> 1191 bytes
 res/drawable-mdpi/ic_images.png                    | Bin 0 -> 1332 bytes
 res/drawable-mdpi/tile_picker_focused.9.png        | Bin 0 -> 165 bytes
 res/drawable-mdpi/tile_picker_pressed.9.png        | Bin 0 -> 142 bytes
 res/drawable-mdpi/tile_picker_selected.9.png       | Bin 0 -> 159 bytes
 res/drawable-mdpi/tile_shadow_bottom.9.png         | Bin 0 -> 140 bytes
 res/drawable-mdpi/tile_shadow_top.9.png            | Bin 0 -> 138 bytes
 res/drawable-xhdpi/ic_actionbar_accept.png         | Bin 0 -> 1599 bytes
 res/drawable-xhdpi/ic_images.png                   | Bin 0 -> 2480 bytes
 res/drawable-xhdpi/tile_picker_focused.9.png       | Bin 0 -> 174 bytes
 res/drawable-xhdpi/tile_picker_pressed.9.png       | Bin 0 -> 147 bytes
 res/drawable-xhdpi/tile_picker_selected.9.png      | Bin 0 -> 167 bytes
 res/drawable-xhdpi/tile_shadow_bottom.9.png        | Bin 0 -> 164 bytes
 res/drawable-xhdpi/tile_shadow_top.9.png           | Bin 0 -> 151 bytes
 res/drawable-xxhdpi/ic_images.png                  | Bin 0 -> 2097 bytes
 res/drawable-xxhdpi/tile_picker_focused.9.png      | Bin 0 -> 189 bytes
 res/drawable-xxhdpi/tile_picker_pressed.9.png      | Bin 0 -> 154 bytes
 res/drawable-xxhdpi/tile_picker_selected.9.png     | Bin 0 -> 175 bytes
 res/drawable-xxhdpi/tile_shadow_bottom.9.png       | Bin 0 -> 185 bytes
 res/drawable-xxhdpi/tile_shadow_top.9.png          | Bin 0 -> 169 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 0 -> 4418 bytes
 res/mipmap-mdpi/ic_launcher_wallpaper.png          | Bin 0 -> 2871 bytes
 res/mipmap-xhdpi/ic_launcher_wallpaper.png         | Bin 0 -> 6061 bytes
 res/mipmap-xxhdpi/ic_launcher_wallpaper.png        | Bin 0 -> 7596 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 insertions(+)
 create mode 100755 res/drawable-hdpi/ic_actionbar_accept.png
 create mode 100644 res/drawable-hdpi/ic_images.png
 create mode 100644 res/drawable-hdpi/tile_picker_focused.9.png
 create mode 100644 res/drawable-hdpi/tile_picker_pressed.9.png
 create mode 100644 res/drawable-hdpi/tile_picker_selected.9.png
 create mode 100644 res/drawable-hdpi/tile_shadow_bottom.9.png
 create mode 100644 res/drawable-hdpi/tile_shadow_top.9.png
 create mode 100755 res/drawable-mdpi/ic_actionbar_accept.png
 create mode 100644 res/drawable-mdpi/ic_images.png
 create mode 100644 res/drawable-mdpi/tile_picker_focused.9.png
 create mode 100644 res/drawable-mdpi/tile_picker_pressed.9.png
 create mode 100644 res/drawable-mdpi/tile_picker_selected.9.png
 create mode 100644 res/drawable-mdpi/tile_shadow_bottom.9.png
 create mode 100644 res/drawable-mdpi/tile_shadow_top.9.png
 create mode 100755 res/drawable-xhdpi/ic_actionbar_accept.png
 create mode 100644 res/drawable-xhdpi/ic_images.png
 create mode 100644 res/drawable-xhdpi/tile_picker_focused.9.png
 create mode 100644 res/drawable-xhdpi/tile_picker_pressed.9.png
 create mode 100644 res/drawable-xhdpi/tile_picker_selected.9.png
 create mode 100644 res/drawable-xhdpi/tile_shadow_bottom.9.png
 create mode 100644 res/drawable-xhdpi/tile_shadow_top.9.png
 create mode 100644 res/drawable-xxhdpi/ic_images.png
 create mode 100644 res/drawable-xxhdpi/tile_picker_focused.9.png
 create mode 100644 res/drawable-xxhdpi/tile_picker_pressed.9.png
 create mode 100644 res/drawable-xxhdpi/tile_picker_selected.9.png
 create mode 100644 res/drawable-xxhdpi/tile_shadow_bottom.9.png
 create mode 100644 res/drawable-xxhdpi/tile_shadow_top.9.png
 create mode 100644 res/drawable/wallpaper_tile_fg.xml
 create mode 100644 res/layout/actionbar_set_wallpaper.xml
 create mode 100644 res/layout/wallpaper_cropper.xml
 create mode 100644 res/layout/wallpaper_picker.xml
 create mode 100644 res/layout/wallpaper_picker_image_picker_item.xml
 create mode 100644 res/layout/wallpaper_picker_item.xml
 create mode 100644 res/layout/wallpaper_picker_live_wallpaper_item.xml
 create mode 100644 res/layout/wallpaper_picker_third_party_item.xml
 create mode 100644 res/menu/cab_delete_wallpapers.xml
 create mode 100644 res/mipmap-hdpi/ic_launcher_wallpaper.png
 create mode 100644 res/mipmap-mdpi/ic_launcher_wallpaper.png
 create mode 100644 res/mipmap-xhdpi/ic_launcher_wallpaper.png
 create mode 100644 res/mipmap-xxhdpi/ic_launcher_wallpaper.png
 create 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
new file mode 100755
index 000000000..53cf6877e
Binary files /dev/null and b/res/drawable-hdpi/ic_actionbar_accept.png differ
diff --git a/res/drawable-hdpi/ic_images.png b/res/drawable-hdpi/ic_images.png
new file mode 100644
index 000000000..0003c6c65
Binary files /dev/null and b/res/drawable-hdpi/ic_images.png differ
diff --git a/res/drawable-hdpi/tile_picker_focused.9.png b/res/drawable-hdpi/tile_picker_focused.9.png
new file mode 100644
index 000000000..c72d6a2c6
Binary files /dev/null and b/res/drawable-hdpi/tile_picker_focused.9.png differ
diff --git a/res/drawable-hdpi/tile_picker_pressed.9.png b/res/drawable-hdpi/tile_picker_pressed.9.png
new file mode 100644
index 000000000..44c65ac3c
Binary files /dev/null and b/res/drawable-hdpi/tile_picker_pressed.9.png differ
diff --git a/res/drawable-hdpi/tile_picker_selected.9.png b/res/drawable-hdpi/tile_picker_selected.9.png
new file mode 100644
index 000000000..461bacbcb
Binary files /dev/null and b/res/drawable-hdpi/tile_picker_selected.9.png differ
diff --git a/res/drawable-hdpi/tile_shadow_bottom.9.png b/res/drawable-hdpi/tile_shadow_bottom.9.png
new file mode 100644
index 000000000..e80558bad
Binary files /dev/null and b/res/drawable-hdpi/tile_shadow_bottom.9.png differ
diff --git a/res/drawable-hdpi/tile_shadow_top.9.png b/res/drawable-hdpi/tile_shadow_top.9.png
new file mode 100644
index 000000000..7e93865e7
Binary files /dev/null and b/res/drawable-hdpi/tile_shadow_top.9.png differ
diff --git a/res/drawable-mdpi/ic_actionbar_accept.png b/res/drawable-mdpi/ic_actionbar_accept.png
new file mode 100755
index 000000000..35cda8e11
Binary files /dev/null and b/res/drawable-mdpi/ic_actionbar_accept.png differ
diff --git a/res/drawable-mdpi/ic_images.png b/res/drawable-mdpi/ic_images.png
new file mode 100644
index 000000000..aabc1237a
Binary files /dev/null and b/res/drawable-mdpi/ic_images.png differ
diff --git a/res/drawable-mdpi/tile_picker_focused.9.png b/res/drawable-mdpi/tile_picker_focused.9.png
new file mode 100644
index 000000000..13b325b87
Binary files /dev/null and b/res/drawable-mdpi/tile_picker_focused.9.png differ
diff --git a/res/drawable-mdpi/tile_picker_pressed.9.png b/res/drawable-mdpi/tile_picker_pressed.9.png
new file mode 100644
index 000000000..4e8196d36
Binary files /dev/null and b/res/drawable-mdpi/tile_picker_pressed.9.png differ
diff --git a/res/drawable-mdpi/tile_picker_selected.9.png b/res/drawable-mdpi/tile_picker_selected.9.png
new file mode 100644
index 000000000..eee69ec6d
Binary files /dev/null and b/res/drawable-mdpi/tile_picker_selected.9.png differ
diff --git a/res/drawable-mdpi/tile_shadow_bottom.9.png b/res/drawable-mdpi/tile_shadow_bottom.9.png
new file mode 100644
index 000000000..d95787bac
Binary files /dev/null and b/res/drawable-mdpi/tile_shadow_bottom.9.png differ
diff --git a/res/drawable-mdpi/tile_shadow_top.9.png b/res/drawable-mdpi/tile_shadow_top.9.png
new file mode 100644
index 000000000..8da913cc4
Binary files /dev/null and b/res/drawable-mdpi/tile_shadow_top.9.png differ
diff --git a/res/drawable-xhdpi/ic_actionbar_accept.png b/res/drawable-xhdpi/ic_actionbar_accept.png
new file mode 100755
index 000000000..b52dc3701
Binary files /dev/null and b/res/drawable-xhdpi/ic_actionbar_accept.png differ
diff --git a/res/drawable-xhdpi/ic_images.png b/res/drawable-xhdpi/ic_images.png
new file mode 100644
index 000000000..3f21faf8f
Binary files /dev/null and b/res/drawable-xhdpi/ic_images.png differ
diff --git a/res/drawable-xhdpi/tile_picker_focused.9.png b/res/drawable-xhdpi/tile_picker_focused.9.png
new file mode 100644
index 000000000..279e85963
Binary files /dev/null and b/res/drawable-xhdpi/tile_picker_focused.9.png differ
diff --git a/res/drawable-xhdpi/tile_picker_pressed.9.png b/res/drawable-xhdpi/tile_picker_pressed.9.png
new file mode 100644
index 000000000..abe0e0080
Binary files /dev/null and b/res/drawable-xhdpi/tile_picker_pressed.9.png differ
diff --git a/res/drawable-xhdpi/tile_picker_selected.9.png b/res/drawable-xhdpi/tile_picker_selected.9.png
new file mode 100644
index 000000000..b047591ac
Binary files /dev/null and b/res/drawable-xhdpi/tile_picker_selected.9.png differ
diff --git a/res/drawable-xhdpi/tile_shadow_bottom.9.png b/res/drawable-xhdpi/tile_shadow_bottom.9.png
new file mode 100644
index 000000000..81571f3b7
Binary files /dev/null and b/res/drawable-xhdpi/tile_shadow_bottom.9.png differ
diff --git a/res/drawable-xhdpi/tile_shadow_top.9.png b/res/drawable-xhdpi/tile_shadow_top.9.png
new file mode 100644
index 000000000..8503a59fe
Binary files /dev/null and b/res/drawable-xhdpi/tile_shadow_top.9.png differ
diff --git a/res/drawable-xxhdpi/ic_images.png b/res/drawable-xxhdpi/ic_images.png
new file mode 100644
index 000000000..d00db9a00
Binary files /dev/null and b/res/drawable-xxhdpi/ic_images.png differ
diff --git a/res/drawable-xxhdpi/tile_picker_focused.9.png b/res/drawable-xxhdpi/tile_picker_focused.9.png
new file mode 100644
index 000000000..1004c14b8
Binary files /dev/null and b/res/drawable-xxhdpi/tile_picker_focused.9.png differ
diff --git a/res/drawable-xxhdpi/tile_picker_pressed.9.png b/res/drawable-xxhdpi/tile_picker_pressed.9.png
new file mode 100644
index 000000000..9658444a1
Binary files /dev/null and b/res/drawable-xxhdpi/tile_picker_pressed.9.png differ
diff --git a/res/drawable-xxhdpi/tile_picker_selected.9.png b/res/drawable-xxhdpi/tile_picker_selected.9.png
new file mode 100644
index 000000000..a3cd30369
Binary files /dev/null and b/res/drawable-xxhdpi/tile_picker_selected.9.png differ
diff --git a/res/drawable-xxhdpi/tile_shadow_bottom.9.png b/res/drawable-xxhdpi/tile_shadow_bottom.9.png
new file mode 100644
index 000000000..55250f041
Binary files /dev/null and b/res/drawable-xxhdpi/tile_shadow_bottom.9.png differ
diff --git a/res/drawable-xxhdpi/tile_shadow_top.9.png b/res/drawable-xxhdpi/tile_shadow_top.9.png
new file mode 100644
index 000000000..3f2263364
Binary files /dev/null and b/res/drawable-xxhdpi/tile_shadow_top.9.png differ
diff --git a/res/drawable/wallpaper_tile_fg.xml b/res/drawable/wallpaper_tile_fg.xml
new file mode 100644
index 000000000..c299f32c6
--- /dev/null
+++ b/res/drawable/wallpaper_tile_fg.xml
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 000000000..1622742a5
--- /dev/null
+++ b/res/layout/actionbar_set_wallpaper.xml
@@ -0,0 +1,34 @@
+<?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
new file mode 100644
index 000000000..abb860898
--- /dev/null
+++ b/res/layout/wallpaper_cropper.xml
@@ -0,0 +1,39 @@
+<?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
new file mode 100644
index 000000000..c36493d2f
--- /dev/null
+++ b/res/layout/wallpaper_picker.xml
@@ -0,0 +1,77 @@
+<?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
new file mode 100644
index 000000000..ae3c43d8e
--- /dev/null
+++ b/res/layout/wallpaper_picker_image_picker_item.xml
@@ -0,0 +1,42 @@
+<?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
new file mode 100644
index 000000000..0ac8f97fb
--- /dev/null
+++ b/res/layout/wallpaper_picker_item.xml
@@ -0,0 +1,30 @@
+<?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
new file mode 100644
index 000000000..29fdb1b82
--- /dev/null
+++ b/res/layout/wallpaper_picker_live_wallpaper_item.xml
@@ -0,0 +1,49 @@
+<?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
new file mode 100644
index 000000000..68661bc00
--- /dev/null
+++ b/res/layout/wallpaper_picker_third_party_item.xml
@@ -0,0 +1,40 @@
+<?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
new file mode 100644
index 000000000..38ac5c4d6
--- /dev/null
+++ b/res/menu/cab_delete_wallpapers.xml
@@ -0,0 +1,27 @@
+<?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
new file mode 100644
index 000000000..affee851d
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_wallpaper.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_wallpaper.png b/res/mipmap-mdpi/ic_launcher_wallpaper.png
new file mode 100644
index 000000000..cb4443bdb
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_wallpaper.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png
new file mode 100644
index 000000000..60f8dceec
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_wallpaper.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
new file mode 100644
index 000000000..023fb5886
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png differ
diff --git a/res/values-nodpi/wallpapers.xml b/res/values-nodpi/wallpapers.xml
new file mode 100644
index 000000000..1e340e4b2
--- /dev/null
+++ b/res/values-nodpi/wallpapers.xml
@@ -0,0 +1,21 @@
+<?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 9ae155b3c..01227e147 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 e1f9ab45a..9738a124b 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 ffee05f18..c07390380 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 28b6a5bcc..c86fe314d 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 361be7b3c..30f4d8fd3 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 4aad5ebfa..8226915dd 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>
-- 
cgit v1.2.3