am bc32f210: Merge change I88e7aada into eclair
Merge commit 'bc32f210e2801860d47c0cf5236b52ae743bc1f8' into eclair-mr2
* commit 'bc32f210e2801860d47c0cf5236b52ae743bc1f8':
New icons for live wallpaper picker.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97be05b..94d925a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,10 +28,10 @@
<application
android:process="android.process.acore"
android:label="@string/application_name"
- android:icon="@drawable/ic_launcher_appwidget">
+ android:icon="@drawable/ic_launcher_live_wallpaper">
<activity android:name="LiveWallpaperListActivity"
- android:icon="@drawable/ic_launcher_appwidget"
+ android:icon="@drawable/ic_launcher_live_wallpaper"
android:label="@string/live_wallpaper_picker_title"
android:theme="@android:style/Theme.NoTitleBar"
android:screenOrientation="nosensor">
@@ -43,7 +43,7 @@
</activity>
<activity android:name="LiveWallpaperPreview"
- android:icon="@drawable/ic_launcher_appwidget"
+ android:icon="@drawable/ic_launcher_live_wallpaper"
android:label="@string/live_wallpaper_preview_title"
android:theme="@style/Preview"
android:screenOrientation="nosensor" />
diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png
deleted file mode 100644
index 3dc8b20..0000000
--- a/res/drawable-hdpi/ic_launcher_appwidget.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_live_wallpaper.png b/res/drawable-hdpi/ic_launcher_live_wallpaper.png
new file mode 100644
index 0000000..6277411
--- /dev/null
+++ b/res/drawable-hdpi/ic_launcher_live_wallpaper.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_live_wallpaper.png b/res/drawable-mdpi/ic_launcher_live_wallpaper.png
new file mode 100644
index 0000000..6de7aaf
--- /dev/null
+++ b/res/drawable-mdpi/ic_launcher_live_wallpaper.png
Binary files differ
diff --git a/res/drawable-mdpi/livewallpaper_placeholder.png b/res/drawable-mdpi/livewallpaper_placeholder.png
new file mode 100644
index 0000000..6a51d0b
--- /dev/null
+++ b/res/drawable-mdpi/livewallpaper_placeholder.png
Binary files differ
