Merge "Lock screen LWP: Enable testing of multiple engine code" (e6f9171f) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -464,8 +464,11 @@ package android.app {

		public class WallpaperManager {
		method @Nullable public android.graphics.Bitmap getBitmap();
		method @Nullable public android.graphics.Bitmap getBitmapAsUser(int, boolean, int);
		method public boolean isLockscreenLiveWallpaperEnabled();
		method @Nullable public android.graphics.Rect peekBitmapDimensions();
		method @Nullable public android.graphics.Rect peekBitmapDimensions(int);
		method public void setWallpaperZoomOut(@NonNull android.os.IBinder, float);
		method public boolean shouldEnableWideColorGamut();
		method @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public boolean wallpaperSupportsWcg(int);
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -784,6 +784,7 @@ public class WallpaperManager {
		* @return true if the lockscreen wallpaper always uses a wallpaperService, not a static image
		* @hide
		*/
		@TestApi
		public boolean isLockscreenLiveWallpaperEnabled() {
		return mLockscreenLiveWallpaper;
		}
		@@ -1258,6 +1259,8 @@ public class WallpaperManager {
		* @param which Specifies home or lock screen
		* @hide
		*/
		@TestApi
		@Nullable
		public Bitmap getBitmapAsUser(int userId, boolean hardware, @SetWallpaperFlags int which) {
		final ColorManagementProxy cmProxy = getColorManagementProxy();
		return sGlobals.peekWallpaperBitmap(mContext, true, which, userId, hardware, cmProxy);
		@@ -2421,6 +2424,7 @@ public class WallpaperManager {
		*
		* @hide
		*/
		@TestApi
		public void setWallpaperZoomOut(@NonNull IBinder windowToken, float zoom) {
		if (zoom < 0 \|\| zoom > 1f) {
		throw new IllegalArgumentException("zoom must be between 0 and 1: " + zoom);