am f9efac12: am 5ef53783: Merge "WindowManagerService not propagating X and Y steps"

* commit 'f9efac1291d7ada7806215d0f63661d6864e9974':
  WindowManagerService not propagating X and Y steps

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
index 6042c27,001a6f8..144bfff
--- 1/services/core/java/com/android/server/wm/WindowManagerService.java
--- 2/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@@ -2273,12 -2206,26 +2273,22 @@@ public class WindowManagerService exten
              } 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();
 -        while (curTokenIndex > 0) {
 -            curTokenIndex--;
 -            WindowToken token = mWallpaperTokens.get(curTokenIndex);
 -            int curWallpaperIndex = token.windows.size();
 -            while (curWallpaperIndex > 0) {
 -                curWallpaperIndex--;
 -                WindowState wallpaper = token.windows.get(curWallpaperIndex);
 +        for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {
 +            WindowList windows = mWallpaperTokens.get(curTokenNdx).windows;
 +            for (int wallpaperNdx = windows.size() - 1; wallpaperNdx >= 0; wallpaperNdx--) {
 +                WindowState wallpaper = windows.get(wallpaperNdx);
                  if (updateWallpaperOffsetLocked(wallpaper, dw, dh, sync)) {
                      WindowStateAnimator winAnimator = wallpaper.mWinAnimator;
                      winAnimator.computeShownFrameLocked();