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

Commit ad3d3b20 authored by Chris Poultney's avatar Chris Poultney
Browse files

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

Adds home/lock screen flag to getWallpaperComponent methods. These
implementations are stubs and will be implemented in master.

Bug: 253481667
Test: TreeHugger
Change-Id: Ia032b78cfa3acb1895e9d74f1793859ef8468c20
parent cbe40d9f

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.