commit 448ae578f9ea27922ea67bbbc7862d1495310b02
author Jerry Chang <chenghsiuchang@google.com> Wed Apr 27 03:50:22 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 27 03:50:22 2022 +0000
tree a07b7802b0cf60679503b84f433d80e1fd04ab55
parent 87028ebc39c1cd51495f4b0252345e38b6cc85c8
parent 59939e9e944db3ae4218da34b764574c24dcb1cb

Merge "Fix divider bar won't fade-in as the other splitting tasks" into tm-dev am: 59939e9e94

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

Change-Id: I523efffd571c815efe94836f3560d3b1c60788b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/quickstep/TaskViewUtils.java

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 29f2123..6179b81 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -38,7 +38,6 @@
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.launcher3.testing.TestProtocol.BAD_STATE;
-import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
@@ -501,7 +500,7 @@
         }
 
         for (int i = 0; i < nonAppTargets.length; ++i) {
-            final SurfaceControl leash = appTargets[i].leash;
+            final SurfaceControl leash = nonAppTargets[i].leash;
             if (nonAppTargets[i].windowType == TYPE_DOCK_DIVIDER && leash != null) {
                 openingTargets.add(leash);
             }