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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15193282 Change-Id: I0bd6d2c474a59c14895a5125079c32b7a4ca7054
2021-07-03 17:47:19 +00:00
parent 89ad9b647d 1f5a4c9522
commit ffee4eaed9
1 changed files with 6 additions and 0 deletions
@@ -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) {