Merge "Use launcher surface when removing launch target" into sc-dev am: e55878cedf

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15193282

Change-Id: Ife796fb90e961d55df70a87cc8f3b84d08a8cc2d

quickstep/src/com/android/launcher3/statehandlers/DepthController.java

@@ -180,6 +180,12 @@ public class DepthController implements StateHandler<LauncherState>,
      * Sets the specified app target surface to apply the blur to.
      */
     public void setSurface(SurfaceControl surface) {
+        // Set launcher as the SurfaceControl when we don't need an external target anymore.
+        if (surface == null) {
+            ViewRootImpl viewRootImpl = mLauncher.getDragLayer().getViewRootImpl();
+            surface = viewRootImpl != null ? viewRootImpl.getSurfaceControl() : null;
+        }
+
         if (mSurface != surface) {
             mSurface = surface;
             if (surface != null) {