Merge "WindowManagerService not propagating X and Y steps"

This commit is contained in:
Olawale Ogunwale
2015-06-01 14:42:36 +00:00
committed by Gerrit Code Review

View File

@@ -2206,6 +2206,16 @@ public class WindowManagerService extends IWindowManager.Stub
} else if (changingTarget.mWallpaperDisplayOffsetY != Integer.MIN_VALUE) {
mLastWallpaperDisplayOffsetY = changingTarget.mWallpaperDisplayOffsetY;
}
if (target.mWallpaperXStep >= 0) {
mLastWallpaperXStep = target.mWallpaperXStep;
} else if (changingTarget.mWallpaperXStep >= 0) {
mLastWallpaperXStep = changingTarget.mWallpaperXStep;
}
if (target.mWallpaperYStep >= 0) {
mLastWallpaperYStep = target.mWallpaperYStep;
} else if (changingTarget.mWallpaperYStep >= 0) {
mLastWallpaperYStep = changingTarget.mWallpaperYStep;
}
}
int curTokenIndex = mWallpaperTokens.size();