| commit | 2327552bad3a04563beb97c3382cb71efe230fd5 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Sat Jul 03 17:29:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 03 17:29:03 2021 +0000 |
| tree | 1c282af395d3d5b708c74500a8756bc81d297e90 | |
| parent | f69592d35e848e2bafc5b42abcff184aeb9cc102 [diff] | |
| parent | e55878cedf301632b37055a9e60a24988de2b01d [diff] |
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: I9e26f8252da408caf9169bf6c88d6e2806adec43
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) {