commit 9859982e0a70698093ef17aa8fba93c3f39cc872
author Vinay Joglekar <vinayjoglekar@google.com> Tue Oct 29 14:29:50 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 29 14:29:50 2024 +0000
tree 9d834eb6684e554c0f30700d635396e60a86913a
parent 9c062e472d60c5d2512ce3ba93dc5ddbf1dd01f1
parent f6a773a476b4366e7a3c34aee87905105d79f98a

Merge "Fix icon during split task which is inside DW from taskbar." into main

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b38d0d7..2d0f15e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -5058,7 +5058,8 @@
         mSplitHiddenTaskViewIndex = indexOfChild(mSplitHiddenTaskView);
         mSplitSelectStateController
                 .setAnimateCurrentTaskDismissal(splitSelectSource.animateCurrentTaskDismissal
-                        && mSplitHiddenTaskView != null);
+                        && mSplitHiddenTaskView != null
+                        && !(mSplitHiddenTaskView instanceof DesktopTaskView));
 
         // Prevent dismissing whole task if we're only initiating from one of 2 tasks in split pair
         mSplitSelectStateController.setDismissingFromSplitPair(mSplitHiddenTaskView != null