Merge "Update wallpaper offset when changing target from null" into sc-dev am: ccdb324274

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521640

Change-Id: I03c15fde7cdea22df72bf5e50355b85cf99ae5d0
This commit is contained in:
Rob Carr
2021-08-11 22:12:25 +00:00
committed by Automerger Merge Worker

View File

@@ -549,6 +549,9 @@ class WallpaperController {
final WindowState prevWallpaperTarget = mWallpaperTarget; final WindowState prevWallpaperTarget = mWallpaperTarget;
mWallpaperTarget = wallpaperTarget; mWallpaperTarget = wallpaperTarget;
if (prevWallpaperTarget == null && wallpaperTarget != null) {
updateWallpaperOffsetLocked(mWallpaperTarget, false);
}
if (wallpaperTarget == null || prevWallpaperTarget == null) { if (wallpaperTarget == null || prevWallpaperTarget == null) {
return; return;
} }