Fix issue #2271640: Fix wallpaper etc docs

Track API changes.

Change-Id: If4a8a97395b4610a50e9f6a5308a99f2ab8c20e0

diff --git a/res/xml/fall.xml b/res/xml/fall.xml
index 767fe70..9b99f2d 100644 (file)
--- a/res/xml/fall.xml
+++ b/res/xml/fall.xml
@@ -21,6 +21,6 @@
 <!-- about the fall wallpaper. -->
 
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:wallpaperAuthor="@string/wallpaper_fall_author"
-    android:wallpaperDescription="@string/wallpaper_fall_desc"
+    android:author="@string/wallpaper_fall_author"
+    android:description="@string/wallpaper_fall_desc"
     android:thumbnail="@drawable/water_thumb" />

diff --git a/res/xml/galaxy.xml b/res/xml/galaxy.xml
index dafa6d3..f668f33 100644 (file)
--- a/res/xml/galaxy.xml
+++ b/res/xml/galaxy.xml
@@ -21,6 +21,6 @@
 <!-- about the galaxy wallpaper. -->
 
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:wallpaperAuthor="@string/wallpaper_galaxy_author"
-    android:wallpaperDescription="@string/wallpaper_galaxy_desc"
+    android:author="@string/wallpaper_galaxy_author"
+    android:description="@string/wallpaper_galaxy_desc"
     android:thumbnail="@drawable/galaxy_thumb" />

diff --git a/res/xml/grass.xml b/res/xml/grass.xml
index c738018..013bda7 100644 (file)
--- a/res/xml/grass.xml
+++ b/res/xml/grass.xml
@@ -21,6 +21,6 @@
 <!-- about the grass wallpaper. -->
 
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:wallpaperAuthor="@string/wallpaper_grass_author"
-    android:wallpaperDescription="@string/wallpaper_grass_desc"
+    android:author="@string/wallpaper_grass_author"
+    android:description="@string/wallpaper_grass_desc"
     android:thumbnail="@drawable/grass_thumb" />

diff --git a/res/xml/nexus.xml b/res/xml/nexus.xml
index 3d14064..4b66d8c 100644 (file)
--- a/res/xml/nexus.xml
+++ b/res/xml/nexus.xml
@@ -21,6 +21,6 @@
 <!-- about the nexus wallpaper. -->
 
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:wallpaperAuthor="@string/wallpaper_nexus_author"
-    android:wallpaperDescription="@string/wallpaper_nexus_desc"
+    android:author="@string/wallpaper_nexus_author"
+    android:description="@string/wallpaper_nexus_desc"
     android:thumbnail="@drawable/nexus_thumb" />

diff --git a/res/xml/polar_clock.xml b/res/xml/polar_clock.xml
index 77ecc20..ef5732f 100644 (file)
--- a/res/xml/polar_clock.xml
+++ b/res/xml/polar_clock.xml
@@ -21,7 +21,7 @@
 <!-- about the polar clock. -->
 
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:wallpaperAuthor="@string/wallpaper_clock_author"
-    android:wallpaperDescription="@string/wallpaper_clock_desc"
+    android:author="@string/wallpaper_clock_author"
+    android:description="@string/wallpaper_clock_desc"
     android:thumbnail="@drawable/polarclock_thumb"
     android:settingsActivity="com.android.wallpaper.polarclock.PolarClockSettings" />

diff --git a/res/xml/walkaround.xml b/res/xml/walkaround.xml
index 3ec573c..84114ae 100644 (file)
--- a/res/xml/walkaround.xml
+++ b/res/xml/walkaround.xml
@@ -21,6 +21,6 @@
 <!-- about the walk around wallpaper. -->
 
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:wallpaperAuthor="@string/wallpaper_walkaround_author"
-    android:wallpaperDescription="@string/wallpaper_walkaround_desc"
+    android:author="@string/wallpaper_walkaround_author"
+    android:description="@string/wallpaper_walkaround_desc"
     android:thumbnail="@drawable/seethru_thumb" />

diff --git a/src/com/android/wallpaper/fall/FallRS.java b/src/com/android/wallpaper/fall/FallRS.java
index dc0d416..3e00c10 100644 (file)
--- a/src/com/android/wallpaper/fall/FallRS.java
+++ b/src/com/android/wallpaper/fall/FallRS.java
@@ -34,6 +34,8 @@ import static android.renderscript.ProgramStore.BlendDstFunc;
 import static android.renderscript.ProgramStore.BlendSrcFunc;
 import static android.renderscript.ProgramFragment.EnvMode.*;
 import static android.renderscript.Element.*;
+
+import android.app.WallpaperManager;
 import android.graphics.BitmapFactory;
 import android.graphics.Bitmap;
 import static android.util.MathUtils.*;
@@ -110,9 +112,9 @@ class FallRS extends RenderScriptScene {
     @Override
     public Bundle onCommand(String action, int x, int y, int z, Bundle extras,
             boolean resultRequested) {
-        if ("android.wallpaper.tap".equals(action)) {
+        if (WallpaperManager.COMMAND_TAP.equals(action)) {
             addDrop(x + (mWorldState.width * mWorldState.xOffset), y);
-        } else if ("android.home.drop".equals(action)) {
+        } else if (WallpaperManager.COMMAND_DROP.equals(action)) {
             addDrop(x + (mWorldState.width * mWorldState.xOffset), y);
         }
         return null;