summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-06-27 02:13:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-27 02:13:17 -0700
commitfec0c188ff7ab39b272561ea2e48aafc72c35ded (patch)
tree742d60f5fe5ed340eb002cd3ae30450ee4bda15d /docs/html
parentb6d148d02a9764abd40af50b096599bb148571b3 (diff)
parent3fd21b562c7c0a60839f06751c59bf853d6377b6 (diff)
downloadframeworks_base-fec0c188ff7ab39b272561ea2e48aafc72c35ded.zip
frameworks_base-fec0c188ff7ab39b272561ea2e48aafc72c35ded.tar.gz
frameworks_base-fec0c188ff7ab39b272561ea2e48aafc72c35ded.tar.bz2
Merge "docs: add info about live wallpaper picker" into jb-dev
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/about/versions/android-4.1.jd14
1 files changed, 9 insertions, 5 deletions
diff --git a/docs/html/about/versions/android-4.1.jd b/docs/html/about/versions/android-4.1.jd
index ef2caa3..675dc99 100644
--- a/docs/html/about/versions/android-4.1.jd
+++ b/docs/html/about/versions/android-4.1.jd
@@ -112,14 +112,18 @@ the content provider does. It's useful when you are interacting with content pro
app.</p>
-<h3 id="LiveWallpapers">Live Wallpapers</h3>
-<p>New intent protocol to directly launch the live wallpaper preview activity, so the user can
-select a specified live wallpaper as the new wallpaper. This allows live wallpapers to provide an
-easy path for the user to select the wallpaper from its own UI, without forcing the user to leave
-the app and navigate through the Home wallpaper picker.</p>
+<h3 id="LiveWallpapers">Live Wallpapers</h3>
+<p>New intent protocol to directly launch the live wallpaper preview activity so you can help
+ users easily select your live wallpaper without forcing them to leave
+your app and navigate through the Home wallpaper picker.</p>
+<p>To launch the live wallpaper picker, call {@link android.content.Context#startActivity
+ startActivity()} with an {@link android.content.Intent} using
+{@link android.app.WallpaperManager#ACTION_CHANGE_LIVE_WALLPAPER} and an extra
+that specifies your live wallpaper {@link android.content.ComponentName} as a string in {@link
+android.app.WallpaperManager#EXTRA_LIVE_WALLPAPER_COMPONENT}.</p>