Merge "WindowManagerService not propagating X and Y steps" into mnc-dev (cbf400b1) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2272,6 +2272,16 @@ public class WindowManagerService extends IWindowManager.Stub
	} else if (changingTarget.mWallpaperDisplayOffsetY != Integer.MIN_VALUE) {		} else if (changingTarget.mWallpaperDisplayOffsetY != Integer.MIN_VALUE) {
	mLastWallpaperDisplayOffsetY = changingTarget.mWallpaperDisplayOffsetY;		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;
			}
	}		}

	for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {		for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {