diff options
| author | 2016-06-24 01:24:00 +0000 | |
|---|---|---|
| committer | 2016-06-24 01:24:01 +0000 | |
| commit | e3f410cd593b5a0fa398850d922e90246e81e5ac (patch) | |
| tree | 345bbf255205d039ba4c6b2bcc512d0a7ffcb604 | |
| parent | b1ca092db8766c8819f0c99feede8c8d63907ad5 (diff) | |
| parent | d136ba16647282ce654b020f461788d5196a1eb7 (diff) | |
Merge "Fix WallpaperInfo API review" into nyc-mr1-dev
| -rw-r--r-- | core/java/android/app/WallpaperInfo.java | 7 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/app/WallpaperInfo.java b/core/java/android/app/WallpaperInfo.java index 84a16cf3e96a..9d40381fcefd 100644 --- a/core/java/android/app/WallpaperInfo.java +++ b/core/java/android/app/WallpaperInfo.java @@ -312,7 +312,12 @@ public final class WallpaperInfo implements Parcelable { } /** - * Queries whether any metadata should be shown when previewing the wallpaper. + * Queries whether any metadata should be shown when previewing the wallpaper. If this value is + * set to true, any component that shows a preview of this live wallpaper should also show + * accompanying information like {@link #loadLabel}, + * {@link #loadDescription}, {@link #loadAuthor} and + * {@link #loadContextDescription(PackageManager)}, so the user gets to know further information + * about this wallpaper. * * @return Whether any metadata should be shown when previewing the wallpaper. */ diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 1c2c590cc5a1..a70c4fd1f97f 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -7353,7 +7353,11 @@ i <!-- Title of the uri that specifies a link for further context of this wallpaper, e.g. Explore collection. --> <attr name="contextDescription" format="reference" /> - <!-- Whether to show any metadata when previewing the wallpaper. --> + <!-- Whether to show any metadata when previewing the wallpaper. If this value is + set to true, any component that shows a preview of this live wallpaper should also show + accompanying information like the title, the description, the author and the context + description of this wallpaper so the user gets to know further information about this + wallpaper. --> <attr name="showMetadataInPreview" format="boolean" /> </declare-styleable> |