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

Commit 9d4472b7 authored by Chris Poultney's avatar Chris Poultney Committed by Automerger Merge Worker
Browse files

Merge "Lock screen live wallpaper: add home/lock screen flag as argument."... 

Merge "Lock screen live wallpaper: add home/lock screen flag as argument." into tm-qpr-dev am: ff75ef23

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404658



Change-Id: Ia1a2de7c9ac9c26c3768b3dc0b6586c2ffcfa4b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab968b75 ff75ef23

core/java/android/app/DisabledWallpaperManager.java

+10 −0
Original line number Diff line number Diff line
@@ -192,6 +192,16 @@ final class DisabledWallpaperManager extends WallpaperManager { 
        return unsupported();

    }



    @Override

    public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) {

        return unsupported();

    }



    @Override

    public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) {

        return unsupported();

    }



    @Override

    public int getWallpaperId(int which) {

        return unsupportedInt();

core/java/android/app/WallpaperManager.java

+27 −6
Original line number Diff line number Diff line
@@ -1320,18 +1320,16 @@ public class WallpaperManager { 
    }



    /**

     * Returns the information about the wallpaper if the current wallpaper is

     * a live wallpaper component. Otherwise, if the wallpaper is a static image,

     * this returns null.

     * Returns the information about the home screen wallpaper if its current wallpaper is a live

     * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.

     */

    public WallpaperInfo getWallpaperInfo() {

        return getWallpaperInfo(mContext.getUserId());

    }



    /**

     * Returns the information about the wallpaper if the current wallpaper is

     * a live wallpaper component. Otherwise, if the wallpaper is a static image,

     * this returns null.

     * Returns the information about the home screen wallpaper if its current wallpaper is a live

     * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.

     *

     * @param userId Owner of the wallpaper.

     * @hide
@@ -1349,6 +1347,29 @@ public class WallpaperManager { 
        }

    }



    /**

     * Returns the information about the home screen wallpaper if its current wallpaper is a live

     * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.

     *

     * @param which Specifies wallpaper destination (home or lock).

     * @hide

     */

    public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) {

        return getWallpaperInfo();

    }



    /**

     * Returns the information about the designated wallpaper if its current wallpaper is a live

     * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.

     *

     * @param which Specifies wallpaper destination (home or lock).

     * @param userId Owner of the wallpaper.

     * @hide

     */

    public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) {

        return getWallpaperInfo(userId);

    }



    /**

     * Get the ID of the current wallpaper of the given kind.  If there is no

     * such wallpaper configured, returns a negative number.