Merge "Desktop windowing wallpaper" into main

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

@@ -64,6 +64,7 @@ import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback;
 import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SPLIT;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 import static com.android.window.flags.Flags.enableDesktopWindowingMode;
+import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity;
 import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50;
 
 import android.animation.Animator;
@@ -965,12 +966,12 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer
 
     @Override
     public void setResumed() {
-        if (mDesktopVisibilityController != null
+        if (!enableDesktopWindowingWallpaperActivity()
+                && mDesktopVisibilityController != null
                 && mDesktopVisibilityController.areDesktopTasksVisible()
                 && !mDesktopVisibilityController.isRecentsGestureInProgress()) {
             // Return early to skip setting activity to appear as resumed
-            // TODO(b/255649902): shouldn't be needed when we have a separate launcher state
-            //  for desktop that we can use to control other parts of launcher
+            // TODO: b/333533253 - Remove after flag rollout
             return;
         }
         super.setResumed();