Do not allow home screen only wallpaper if current is the default am: 7742666ea7 am: cd23f3d5f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/15567276
Change-Id: Ie53b9abccd8923fd4c06208b26a3c73eaa19d2a7
diff --git a/src/com/android/wallpaper/module/WallpaperSetter.java b/src/com/android/wallpaper/module/WallpaperSetter.java
index bd4da96..2bc2f5c 100644
--- a/src/com/android/wallpaper/module/WallpaperSetter.java
+++ b/src/com/android/wallpaper/module/WallpaperSetter.java
@@ -22,6 +22,7 @@
import com.android.wallpaper.R;
import com.android.wallpaper.asset.Asset;
+import com.android.wallpaper.asset.BuiltInWallpaperAsset;
import com.android.wallpaper.model.LiveWallpaperInfo;
import com.android.wallpaper.model.WallpaperInfo;
import com.android.wallpaper.module.UserEventLogger.WallpaperSetFailureReason;
@@ -307,7 +308,9 @@
SetWallpaperDialogFragment setWallpaperDialog = new SetWallpaperDialogFragment();
setWallpaperDialog.setTitleResId(titleResId);
setWallpaperDialog.setListener(listenerWrapper);
- if (homeWallpaper instanceof LiveWallpaperInfo && lockWallpaper == null) {
+ boolean isBuiltIn = homeWallpaper.getAsset(activity) instanceof BuiltInWallpaperAsset;
+ if ((homeWallpaper instanceof LiveWallpaperInfo || isBuiltIn)
+ && lockWallpaper == null) {
if (isLiveWallpaper) {
// If lock wallpaper is live and we're setting a live wallpaper, we can only
// set it to both, so bypass the dialog.