summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-11-19 11:15:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-19 11:15:54 -0800
commit702c2a7390d66282c53d17fbec1a061feaee7856 (patch)
tree69255cb1b75f1f800ca53683aef514a2f4f2c73a
parent4c7fb7d03eae2863784aa4a8f5133c86afb48fd2 (diff)
parentd15aa1a38f1ea840ebf60ec039199932671d40da (diff)
downloadandroid_packages_wallpapers_MagicSmoke-702c2a7390d66282c53d17fbec1a061feaee7856.tar.gz
android_packages_wallpapers_MagicSmoke-702c2a7390d66282c53d17fbec1a061feaee7856.tar.bz2
android_packages_wallpapers_MagicSmoke-702c2a7390d66282c53d17fbec1a061feaee7856.zip
am d15aa1a3: am 4875eb5f: Fix issue #2271640: Fix wallpaper etc docs
Merge commit 'd15aa1a38f1ea840ebf60ec039199932671d40da' * commit 'd15aa1a38f1ea840ebf60ec039199932671d40da': 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"
/>