Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584093c4 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge \"Merge \\"Fix WallpaperInfo API review\\" into nyc-mr1-dev am:... 

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

Change-Id: I2eb0781e704ebe1ec9f198a332fe162136af3897
parents 8278d541 17fedfbd

core/java/android/app/WallpaperInfo.java

+6 −1
Original line number Diff line number Diff line
@@ -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.

     */

core/res/res/values/attrs.xml

+5 −1
Original line number Diff line number Diff line
@@ -7355,7 +7355,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>