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
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e6d8435..54130e9 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 772e627..8074c4c 100644
--- a/res/drawable-hdpi/ic_launcher_application.png
+++ b/res/drawable-hdpi/ic_launcher_application.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png
index 60fbdf5..3dc8b20 100644
--- a/res/drawable-hdpi/ic_launcher_appwidget.png
+++ b/res/drawable-hdpi/ic_launcher_appwidget.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_folder.png b/res/drawable-hdpi/ic_launcher_folder.png
index a354d38..dd71327 100644
--- a/res/drawable-hdpi/ic_launcher_folder.png
+++ b/res/drawable-hdpi/ic_launcher_folder.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_folder_open.png b/res/drawable-hdpi/ic_launcher_folder_open.png
index 6e80768..5b3fcec 100644
--- a/res/drawable-hdpi/ic_launcher_folder_open.png
+++ b/res/drawable-hdpi/ic_launcher_folder_open.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_gallery.png b/res/drawable-hdpi/ic_launcher_gallery.png
deleted file mode 100644
index e7b1575..0000000
--- a/res/drawable-hdpi/ic_launcher_gallery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/drawable-hdpi/ic_launcher_home.png
index 1e256e6..74f6bd7 100644
--- a/res/drawable-hdpi/ic_launcher_home.png
+++ b/res/drawable-hdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut.png b/res/drawable-hdpi/ic_launcher_shortcut.png
index a2f7135..93ab2df 100644
--- a/res/drawable-hdpi/ic_launcher_shortcut.png
+++ b/res/drawable-hdpi/ic_launcher_shortcut.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png
new file mode 100644
index 0000000..dcd8709
--- /dev/null
+++ b/res/drawable-hdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_widget.png b/res/drawable-hdpi/ic_search_widget.png
index ea5baa0..06b9b25 100644
--- a/res/drawable-hdpi/ic_search_widget.png
+++ b/res/drawable-hdpi/ic_search_widget.png
Binary files differ
diff --git a/res/drawable-hdpi/search_button_voice.png b/res/drawable-hdpi/search_button_voice.png
index 803b9fd..a60f7d9 100644
--- a/res/drawable-hdpi/search_button_voice.png
+++ b/res/drawable-hdpi/search_button_voice.png
Binary files differ
diff --git a/res/drawable-hdpi/search_floater.9.png b/res/drawable-hdpi/search_floater.9.png
index 7f49f31..1c6d836 100644
--- a/res/drawable-hdpi/search_floater.9.png
+++ b/res/drawable-hdpi/search_floater.9.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_searchwidget_default.9.png b/res/drawable-hdpi/textfield_searchwidget_default.9.png
index 80f5199..2fe637d 100644
--- a/res/drawable-hdpi/textfield_searchwidget_default.9.png
+++ b/res/drawable-hdpi/textfield_searchwidget_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_searchwidget_pressed.9.png b/res/drawable-hdpi/textfield_searchwidget_pressed.9.png
index 3fa3aa9..58af9ba 100644
--- a/res/drawable-hdpi/textfield_searchwidget_pressed.9.png
+++ b/res/drawable-hdpi/textfield_searchwidget_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_searchwidget_selected.9.png b/res/drawable-hdpi/textfield_searchwidget_selected.9.png
index 9d4bc8c..8a84fdc 100644
--- a/res/drawable-hdpi/textfield_searchwidget_selected.9.png
+++ b/res/drawable-hdpi/textfield_searchwidget_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_gallery.png b/res/drawable-mdpi/ic_launcher_gallery.png
deleted file mode 100755
index 965fb71..0000000
--- a/res/drawable-mdpi/ic_launcher_gallery.png
+++ /dev/null
Binary files differ
diff --git a/src/com/android/launcher2/AddAdapter.java b/src/com/android/launcher2/AddAdapter.java
index 0c63fa5..785d283 100644
--- a/src/com/android/launcher2/AddAdapter.java
+++ b/src/com/android/launcher2/AddAdapter.java
@@ -78,7 +78,7 @@
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));
}
