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

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>

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));
 
     }