commit 9f3ad05e6f2cbe964e23773669469dd48967098f
author Lucas Dupin <dupin@google.com> Sat Jul 03 17:46:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jul 03 17:46:51 2021 +0000
tree d1b59d65b27621d583e35763077d4c957e01ae26
parent b0d51ac8e61e0de4fb56efe2c3d5f1078194fc85
parent 2327552bad3a04563beb97c3382cb71efe230fd5

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

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

Change-Id: I6757587d671c2de1c6e8866b860331e72cdb1b8b

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

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index bb8b62d..82582ee 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -180,6 +180,12 @@
      * 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) {