summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2009-11-17 15:09:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-17 15:09:05 -0800
commitb138fcc17cd953a63951c998365ea35e8511408c (patch)
treee62902b899126efc251985c8d6c55a9f66019a95
parent4a22aaa31f896861d861521b779a270cfcaf31db (diff)
parent81a281579c85bf2a3b64a643fc619c884f2ae38c (diff)
downloadandroid_packages_wallpapers_LivePicker-b138fcc17cd953a63951c998365ea35e8511408c.zip
android_packages_wallpapers_LivePicker-b138fcc17cd953a63951c998365ea35e8511408c.tar.gz
android_packages_wallpapers_LivePicker-b138fcc17cd953a63951c998365ea35e8511408c.tar.bz2
am 81a28157: am bc32f210: Merge change I88e7aada into eclair
Merge commit '81a281579c85bf2a3b64a643fc619c884f2ae38c' * commit '81a281579c85bf2a3b64a643fc619c884f2ae38c': New icons for live wallpaper picker.
-rw-r--r--AndroidManifest.xml6
-rw-r--r--res/drawable-hdpi/ic_launcher_appwidget.pngbin7240 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_live_wallpaper.pngbin0 -> 6333 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_live_wallpaper.pngbin0 -> 3259 bytes
-rw-r--r--res/drawable-mdpi/livewallpaper_placeholder.pngbin0 -> 2478 bytes
5 files changed, 3 insertions, 3 deletions
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