Merge "Add method in WallpaperManager to get config_independentLockscreenLiveWallpaper"

This commit is contained in:
Aurélien Pomini
2022-12-21 12:25:29 +00:00
committed by Android (Google) Code Review

View File

@@ -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>