commit 59939e9e944db3ae4218da34b764574c24dcb1cb
author Jerry Chang <chenghsiuchang@google.com> Wed Apr 27 03:02:57 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 27 03:02:57 2022 +0000
tree 1dcabb6bba495d187b76b4394593e0aaa03cabc8
parent a2d3bbe27e1e9713a2af089d4ceab6391e409c99
parent c3865b86e4f379dbc9a5fdd7b3a202a1cbe44f31

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

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);
             }