Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev am: e3f410cd59" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-24 01:33:29 +00:00
committed by Android (Google) Code Review
parent 89a922493b 5cd3e8396d
commit 17fedfbdc7
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/WallpaperInfo.java
View File

@@ -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. * @return Whether any metadata should be shown when previewing the wallpaper.
*/ */

6
core/res/res/values/attrs.xml
View File

@@ -7353,7 +7353,11 @@ i
<!-- Title of the uri that specifies a link for further context of this wallpaper, e.g. Explore collection. --> <!-- Title of the uri that specifies a link for further context of this wallpaper, e.g. Explore collection. -->
<attr name="contextDescription" format="reference" /> <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" /> <attr name="showMetadataInPreview" format="boolean" />
</declare-styleable> </declare-styleable>