summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-11-17 06:58:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-11-17 06:58:44 -0800
commitbc32f210e2801860d47c0cf5236b52ae743bc1f8 (patch)
tree96ea51fbfc3b474bac0833a18e550f9e3f539cc9
parentb6160c3a1823638ffe9fb5cf2f2fead4a3d9c4e2 (diff)
parent88e7aada92f19b85cc4c334266ffe32aa37d5019 (diff)
downloadandroid_packages_wallpapers_LivePicker-bc32f210e2801860d47c0cf5236b52ae743bc1f8.tar.gz
android_packages_wallpapers_LivePicker-bc32f210e2801860d47c0cf5236b52ae743bc1f8.tar.bz2
android_packages_wallpapers_LivePicker-bc32f210e2801860d47c0cf5236b52ae743bc1f8.zip
Merge change I88e7aada into eclair
* changes: 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