Pull over new icons from Launcher to Launcher2.

NB: Removed obsolete ic_launcher_gallery.png; wallpaper
should now use ic_launcher_wallpaper.png.

Change-Id: I3d74a6ae7d948b48cc902e28a361a1993f4273d2

17 files changed, 3 insertions, 2 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e6d8435bb..54130e971 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,7 +92,7 @@
         <activity
             android:name="WallpaperChooser"
             android:label="@string/pick_wallpaper"
-            android:icon="@drawable/ic_launcher_gallery">
+            android:icon="@drawable/ic_launcher_wallpaper">
             <intent-filter>
                 <action android:name="android.intent.action.SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -102,6 +102,7 @@
         <!-- TODO: MOVE TO SETTINGS (or actually maybe to its own package) -->
         <!-- Standard picker for live wallpapers -->
         <activity android:name="LiveWallpaperPickActivity"
+                android:icon="@drawable/ic_launcher_appwidget"
                 android:label="@string/live_wallpaper_picker_title"
                 android:theme="@android:style/Theme.Wallpaper">
             <intent-filter>
diff --git a/res/drawable-hdpi/ic_launcher_application.png b/res/drawable-hdpi/ic_launcher_application.png
index 772e62787..8074c4c57 100644
--- a/res/drawable-hdpi/ic_launcher_application.png
+++ b/res/drawable-hdpi/ic_launcher_application.png
diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png
index 60fbdf5d0..3dc8b2075 100644
--- a/res/drawable-hdpi/ic_launcher_appwidget.png
+++ b/res/drawable-hdpi/ic_launcher_appwidget.png
diff --git a/res/drawable-hdpi/ic_launcher_folder.png b/res/drawable-hdpi/ic_launcher_folder.png
index a354d38e5..dd7132716 100644
--- a/res/drawable-hdpi/ic_launcher_folder.png
+++ b/res/drawable-hdpi/ic_launcher_folder.png
diff --git a/res/drawable-hdpi/ic_launcher_folder_open.png b/res/drawable-hdpi/ic_launcher_folder_open.png
index 6e8076877..5b3fcecb3 100644
--- a/res/drawable-hdpi/ic_launcher_folder_open.png
+++ b/res/drawable-hdpi/ic_launcher_folder_open.png
diff --git a/res/drawable-hdpi/ic_launcher_gallery.png b/res/drawable-hdpi/ic_launcher_gallery.png
deleted file mode 100644
index e7b1575fb..000000000
--- a/res/drawable-hdpi/ic_launcher_gallery.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/drawable-hdpi/ic_launcher_home.png
index 1e256e683..74f6bd7b6 100644
--- a/res/drawable-hdpi/ic_launcher_home.png
+++ b/res/drawable-hdpi/ic_launcher_home.png
diff --git a/res/drawable-hdpi/ic_launcher_shortcut.png b/res/drawable-hdpi/ic_launcher_shortcut.png
index a2f71358f..93ab2df73 100644
--- a/res/drawable-hdpi/ic_launcher_shortcut.png
+++ b/res/drawable-hdpi/ic_launcher_shortcut.png
diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png
new file mode 100644
index 000000000..dcd87097c
--- /dev/null
+++ b/res/drawable-hdpi/ic_launcher_wallpaper.png
diff --git a/res/drawable-hdpi/ic_search_widget.png b/res/drawable-hdpi/ic_search_widget.png
index ea5baa0cb..06b9b251b 100644
--- a/res/drawable-hdpi/ic_search_widget.png
+++ b/res/drawable-hdpi/ic_search_widget.png
diff --git a/res/drawable-hdpi/search_button_voice.png b/res/drawable-hdpi/search_button_voice.png
index 803b9fd4b..a60f7d9c9 100644
--- a/res/drawable-hdpi/search_button_voice.png
+++ b/res/drawable-hdpi/search_button_voice.png
diff --git a/res/drawable-hdpi/search_floater.9.png b/res/drawable-hdpi/search_floater.9.png
index 7f49f3152..1c6d836ea 100644
--- a/res/drawable-hdpi/search_floater.9.png
+++ b/res/drawable-hdpi/search_floater.9.png
diff --git a/res/drawable-hdpi/textfield_searchwidget_default.9.png b/res/drawable-hdpi/textfield_searchwidget_default.9.png
index 80f51998b..2fe637d5f 100644
--- a/res/drawable-hdpi/textfield_searchwidget_default.9.png
+++ b/res/drawable-hdpi/textfield_searchwidget_default.9.png
diff --git a/res/drawable-hdpi/textfield_searchwidget_pressed.9.png b/res/drawable-hdpi/textfield_searchwidget_pressed.9.png
index 3fa3aa90f..58af9baf4 100644
--- a/res/drawable-hdpi/textfield_searchwidget_pressed.9.png
+++ b/res/drawable-hdpi/textfield_searchwidget_pressed.9.png
diff --git a/res/drawable-hdpi/textfield_searchwidget_selected.9.png b/res/drawable-hdpi/textfield_searchwidget_selected.9.png
index 9d4bc8c4a..8a84fdcac 100644
--- a/res/drawable-hdpi/textfield_searchwidget_selected.9.png
+++ b/res/drawable-hdpi/textfield_searchwidget_selected.9.png
diff --git a/res/drawable-mdpi/ic_launcher_gallery.png b/res/drawable-mdpi/ic_launcher_gallery.png
deleted file mode 100755
index 965fb7143..000000000
--- a/res/drawable-mdpi/ic_launcher_gallery.png
+++ /dev/null
diff --git a/src/com/android/launcher2/AddAdapter.java b/src/com/android/launcher2/AddAdapter.java
index 0c63fa5d6..785d283ec 100644
--- a/src/com/android/launcher2/AddAdapter.java
+++ b/src/com/android/launcher2/AddAdapter.java
@@ -78,7 +78,7 @@ public class AddAdapter extends BaseAdapter {
                 R.drawable.ic_launcher_folder_live, ITEM_LIVE_FOLDER));
         
         mItems.add(new ListItem(res, R.string.group_wallpapers,
-                R.drawable.ic_launcher_gallery, ITEM_WALLPAPER));
+                R.drawable.ic_launcher_wallpaper, ITEM_WALLPAPER));
 
     }