commit fe22e7fa4da1e36cde9bfba84671d625fc1b8d3b
author Vinit Nayak <peanutbutter@google.com> Fri Dec 08 22:34:33 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 08 22:34:33 2023 +0000
tree def936f4e6a9397d279f2a89ea1092e396f15f81
parent 5eac9a5d81a672a3eed95a11159a5285e711a3bf
parent 14f3a795e15155de694982f3e93426f643306a3f

Merge "Only launch from split taskView if it's visible to user" into main

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 8b27a85..82c4125 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -634,7 +634,11 @@
             };
 
             MAIN_EXECUTOR.execute(() -> {
-                TaskViewUtils.composeRecentsSplitLaunchAnimator(mLaunchingTaskView, mStateManager,
+                // Only animate from taskView if it's already visible
+                boolean shouldLaunchFromTaskView = mLaunchingTaskView != null &&
+                        mLaunchingTaskView.getRecentsView().isTaskViewVisible(mLaunchingTaskView);
+                TaskViewUtils.composeRecentsSplitLaunchAnimator(shouldLaunchFromTaskView
+                                ? mLaunchingTaskView : null, mStateManager,
                         mDepthController, mInitialTaskId, mSecondTaskId, info, t, () -> {
                             finishAdapter.run();
                             cleanup(true /*success*/);