commit d9531d18f066b1a8f94a1c68bf39abc9671e049a
author Lucas Dupin <dupin@google.com> Wed Aug 25 01:08:18 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 25 01:08:18 2021 +0000
tree 44c18a7a09fdba99a5c531a29da356a1886d0be2
parent 86eb1daa058b8983f072da71565b5d7745bd82b7
parent a2a018ec77b608ef607f2755111dc33a39a37bd3

Merge "Synchronize surface transaction" into sc-v2-dev am: 45f09dc38a am: a2a018ec77

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

Change-Id: I8d51cb0cc2e86f6a5e962c04db9ae79e22b37f9c

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 5777fb9..68159fa 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -26,6 +26,7 @@
 import android.os.IBinder;
 import android.os.SystemProperties;
 import android.util.FloatProperty;
+import android.view.AttachedSurfaceControl;
 import android.view.CrossWindowBlurListeners;
 import android.view.SurfaceControl;
 import android.view.View;
@@ -316,7 +317,12 @@
                 transaction.setEarlyWakeupEnd();
                 mInEarlyWakeUp = false;
             }
-            transaction.apply();
+
+            AttachedSurfaceControl rootSurfaceControl =
+                    mLauncher.getRootView().getRootSurfaceControl();
+            if (rootSurfaceControl != null) {
+                rootSurfaceControl.applyTransactionOnDraw(transaction);
+            }
         }
         return true;
     }