| commit | ffee4eaed9780cee7b3319a51a8d8f54c16dbd5e | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Sat Jul 03 17:47:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 03 17:47:19 2021 +0000 |
| tree | 1c67e6e7ad96b420ab1870b91cf42f3b4004504d | |
| parent | 89ad9b647de3c6dc2c979c6cabeee2eb13160a56 [diff] | |
| parent | 1f5a4c9522824810d3703cc7655c312be2407157 [diff] |
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
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) {