diff options
author | Daniel Sandler <dsandler@google.com> | 2009-11-17 07:01:27 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-17 07:01:27 -0800 |
commit | 81a281579c85bf2a3b64a643fc619c884f2ae38c (patch) | |
tree | cfc922c1ca2698419c0509d5ec5e9b091dd2e932 | |
parent | 7d227e9821b8df7ee6c4c794e82442205c87e795 (diff) | |
parent | bc32f210e2801860d47c0cf5236b52ae743bc1f8 (diff) | |
download | android_packages_wallpapers_LivePicker-81a281579c85bf2a3b64a643fc619c884f2ae38c.tar.gz android_packages_wallpapers_LivePicker-81a281579c85bf2a3b64a643fc619c884f2ae38c.tar.bz2 android_packages_wallpapers_LivePicker-81a281579c85bf2a3b64a643fc619c884f2ae38c.zip |
am bc32f210: Merge change I88e7aada into eclair
Merge commit 'bc32f210e2801860d47c0cf5236b52ae743bc1f8' into eclair-mr2
* commit 'bc32f210e2801860d47c0cf5236b52ae743bc1f8':
New icons for live wallpaper picker.
-rw-r--r-- | AndroidManifest.xml | 6 | ||||
-rw-r--r-- | res/drawable-hdpi/ic_launcher_appwidget.png | bin | 7240 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_launcher_live_wallpaper.png | bin | 0 -> 6333 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_launcher_live_wallpaper.png | bin | 0 -> 3259 bytes | |||
-rw-r--r-- | res/drawable-mdpi/livewallpaper_placeholder.png | bin | 0 -> 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 Binary files differdeleted file mode 100644 index 3dc8b20..0000000 --- a/res/drawable-hdpi/ic_launcher_appwidget.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_launcher_live_wallpaper.png b/res/drawable-hdpi/ic_launcher_live_wallpaper.png Binary files differnew file mode 100644 index 0000000..6277411 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_live_wallpaper.png diff --git a/res/drawable-mdpi/ic_launcher_live_wallpaper.png b/res/drawable-mdpi/ic_launcher_live_wallpaper.png Binary files differnew file mode 100644 index 0000000..6de7aaf --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_live_wallpaper.png diff --git a/res/drawable-mdpi/livewallpaper_placeholder.png b/res/drawable-mdpi/livewallpaper_placeholder.png Binary files differnew file mode 100644 index 0000000..6a51d0b --- /dev/null +++ b/res/drawable-mdpi/livewallpaper_placeholder.png |