summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-11-19 11:08:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-19 11:08:31 -0800
commitd15aa1a38f1ea840ebf60ec039199932671d40da (patch)
tree69255cb1b75f1f800ca53683aef514a2f4f2c73a
parent642d9682d81e8a6cddc55ccf517d46cdf0664a17 (diff)
parent4875eb5fd284b9fa73b6c5326ebcc2fe6be10336 (diff)
downloadandroid_packages_wallpapers_MagicSmoke-d15aa1a38f1ea840ebf60ec039199932671d40da.tar.gz
android_packages_wallpapers_MagicSmoke-d15aa1a38f1ea840ebf60ec039199932671d40da.tar.bz2
android_packages_wallpapers_MagicSmoke-d15aa1a38f1ea840ebf60ec039199932671d40da.zip
am 4875eb5f: Fix issue #2271640: Fix wallpaper etc docs
Merge commit '4875eb5fd284b9fa73b6c5326ebcc2fe6be10336' into eclair-mr2 * commit '4875eb5fd284b9fa73b6c5326ebcc2fe6be10336': Fix issue #2271640: Fix wallpaper etc docs
-rw-r--r--res/xml/magicsmoke.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/xml/magicsmoke.xml b/res/xml/magicsmoke.xml
index fed502a..f1f5cd2 100644
--- a/res/xml/magicsmoke.xml
+++ b/res/xml/magicsmoke.xml
@@ -21,8 +21,8 @@
<!-- for the cube. -->
<wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
- android:wallpaperAuthor="@string/author"
- android:wallpaperDescription="@string/magicsmoke_desc"
+ android:author="@string/author"
+ android:description="@string/magicsmoke_desc"
android:thumbnail="@drawable/magicsmoke_thumb"
android:settingsActivity="com.android.magicsmoke.MagicSmokeSelector"
/>