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

Commit aed2fe0d authored by Marzia Favaro's avatar Marzia Favaro Committed by Android (Google) Code Review
Browse files

Merge "Make the wallpaper offset update asynchronous" into main

parents a27453ef 22629d45

core/java/android/window/flags/windowing_frontend.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -28,3 +28,12 @@ flag { 
  description: "Enable accurate transition readiness tracking"

  bug: "294925498"

}





flag {

    name: "wallpaper_offset_async"

    namespace: "windowing_frontend"

    description: "Do not synchronise the wallpaper offset"

    bug: "293248754"

    is_fixed_read_only: true

}
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ class WallpaperController { 
            window.mWallpaperY = y;

            window.mWallpaperXStep = xStep;

            window.mWallpaperYStep = yStep;

            updateWallpaperOffsetLocked(window, true);

            updateWallpaperOffsetLocked(window, !mService.mFlags.mWallpaperOffsetAsync);

        }

    }
@@ -561,7 +561,7 @@ class WallpaperController { 
        if (window.mWallpaperDisplayOffsetX != x || window.mWallpaperDisplayOffsetY != y)  {

            window.mWallpaperDisplayOffsetX = x;

            window.mWallpaperDisplayOffsetY = y;

            updateWallpaperOffsetLocked(window, true);

            updateWallpaperOffsetLocked(window, !mService.mFlags.mWallpaperOffsetAsync);

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ class WallpaperWindowToken extends WindowToken { 
        final WallpaperController wallpaperController = mDisplayContent.mWallpaperController;

        for (int wallpaperNdx = mChildren.size() - 1; wallpaperNdx >= 0; wallpaperNdx--) {

            final WindowState wallpaper = mChildren.get(wallpaperNdx);

            if (wallpaperController.updateWallpaperOffset(wallpaper, sync)) {

            if (wallpaperController.updateWallpaperOffset(wallpaper,

                    sync && !mWmService.mFlags.mWallpaperOffsetAsync)) {

                // We only want to be synchronous with one wallpaper.

                sync = false;

            }

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

+2 −0
Original line number Diff line number Diff line
@@ -47,5 +47,7 @@ class WindowManagerFlags { 


    final boolean mWindowStateResizeItemFlag = Flags.windowStateResizeItemFlag();



    final boolean mWallpaperOffsetAsync = Flags.wallpaperOffsetAsync();



    /* End Available Flags */

}