diff options
| -rw-r--r-- | api/current.xml | 24 | ||||
| -rw-r--r-- | core/java/android/app/WallpaperManager.java | 8 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 12 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
4 files changed, 43 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index 960551127cc7..5f22c476dd42 100644 --- a/api/current.xml +++ b/api/current.xml @@ -8886,6 +8886,17 @@ visibility="public" > </field> +<field name="staticWallpaperPreview" + type="int" + transient="false" + volatile="false" + value="16843584" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="stepSize" type="int" transient="false" @@ -36149,6 +36160,17 @@ visibility="public" > </field> +<field name="WALLPAPER_PREVIEW_META_DATA" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.wallpaper.preview"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> </package> <package name="android.app.admin" @@ -250950,7 +250972,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="arg0" type="T"> +<parameter name="t" type="T"> </parameter> </method> </interface> diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index b95b123ce343..13a8b78d4832 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -62,7 +62,13 @@ public class WallpaperManager { */ public static final String ACTION_LIVE_WALLPAPER_CHOOSER = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER"; - + + /** + * Manifest entry for activities that respond to {@link Intent#ACTION_SET_WALLPAPER} + * which allows them to provide a custom large icon associated with this action. + */ + public static final String WALLPAPER_PREVIEW_META_DATA = "android.wallpaper.preview"; + /** * Command for {@link #sendWallpaperCommand}: reported by the wallpaper * host when the user taps on an empty area (not performing an action diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 4bd91b3d6379..9aabfc4bef54 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -4282,6 +4282,18 @@ </declare-styleable> <!-- =============================== --> + <!-- Wallpaper preview attributes --> + <!-- =============================== --> + <eat-comment /> + + <!-- Use <code>wallpaper-preview</code> as the root tag of the XML resource that + describes a wallpaper preview. --> + <declare-styleable name="WallpaperPreviewInfo"> + <!-- A resource id of a static drawable. --> + <attr name="staticWallpaperPreview" format="reference" /> + </declare-styleable> + + <!-- =============================== --> <!-- App package class attributes --> <!-- =============================== --> <eat-comment /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 8fa1d320ed72..22fe535bbcca 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1398,6 +1398,7 @@ <public type="attr" name="buttonBarStyle" /> <public type="attr" name="buttonBarButtonStyle" /> <public type="attr" name="segmentedButtonStyle" /> + <public type="attr" name="staticWallpaperPreview" /> <public type="anim" name="animator_fade_in" /> <public type="anim" name="animator_fade_out" /> |