Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec7b82b authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

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

* commit '185a3d7d':
  WindowManagerService not propagating X and Y steps
parents b7483632 185a3d7d

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

+10 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,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;

            }

        }



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