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

Commit c44d33ac authored by Aurélien Pomini's avatar Aurélien Pomini
Browse files

Add method in WallpaperManager to get config_independentLockscreenLiveWallpaper 

LockscreenWallpaper.java (and potentially other files) have access to a WallpaperManager instance, but no instance of context/resources.

To minimise changes, a hidden method boolean isLockscreenLiveWallpaperEnabled() has been added to WallpaperManager to get the config flag.

Other classes can use this flag and implement the new wallpaper logic when it is true.

Bug: 197814683
Test: treehugger (low-risk, no logic changes)
Change-Id: I791ba72f571f996906d2c23f97bba7b88b2fe21f
parent 7c3628fc

core/java/android/app/WallpaperManager.java

+15 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ public class WallpaperManager { 
    private static final @NonNull RectF LOCAL_COLOR_BOUNDS =

            new RectF(0, 0, 1, 1);



    /** Temporary feature flag for project b/197814683 */

    private final boolean mLockscreenLiveWallpaper;



    /** {@hide} */

    private static final String PROP_WALLPAPER = "ro.config.wallpaper";

    /** {@hide} */
@@ -750,6 +753,8 @@ public class WallpaperManager { 
        mWcgEnabled = context.getResources().getConfiguration().isScreenWideColorGamut()

                && context.getResources().getBoolean(R.bool.config_enableWcgMode);

        mCmProxy = new ColorManagementProxy(context);

        mLockscreenLiveWallpaper = context.getResources()

                .getBoolean(R.bool.config_independentLockscreenLiveWallpaper);

    }



    // no-op constructor called just by DisabledWallpaperManager
@@ -757,6 +762,7 @@ public class WallpaperManager { 
        mContext = null;

        mCmProxy = null;

        mWcgEnabled = false;

        mLockscreenLiveWallpaper = false;

    }



    /**
@@ -773,6 +779,15 @@ public class WallpaperManager { 
        return sGlobals.mService;

    }



    /**

     * Temporary method for project b/197814683.

     * @return true if the lockscreen wallpaper always uses a wallpaperService, not a static image

     * @hide

     */

    public boolean isLockscreenLiveWallpaperEnabled() {

        return mLockscreenLiveWallpaper;

    }



    /**

     * Indicate whether wcg (Wide Color Gamut) should be enabled.

     * <p>