From 2db58f68ee25f3551313bf6df14b6f7817fd3434 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 9 Nov 2021 14:27:29 -0800
Subject: [PATCH] Finish recents animation for app-icon tap

* There is a layering issue w/ live tile
* Also, order tasks for app-pair when binding

Bug: 205354856
Change-Id: I4fb5b9ed070e96299fd4b58d172ebba93789d009
---
 .../src/com/android/quickstep/views/RecentsView.java   |  8 ++++++--
 .../src/com/android/quickstep/views/TaskView.java      | 10 +++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 1d01b7a564..72e01bb548 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1343,8 +1343,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             addView(taskView);
 
             if (hasMultipleTasks) {
-                ((GroupedTaskView) taskView).bind(groupTask.task1, groupTask.task2,
-                        mOrientationState, groupTask.mStagedSplitBounds);
+                boolean firstTaskIsLeftTopTask =
+                        groupTask.mStagedSplitBounds.leftTopTaskId == groupTask.task1.key.id;
+                Task leftTopTask = firstTaskIsLeftTopTask ? groupTask.task1 : groupTask.task2;
+                Task rightBottomTask = firstTaskIsLeftTopTask ? groupTask.task2 : groupTask.task1;
+                ((GroupedTaskView) taskView).bind(leftTopTask, rightBottomTask, mOrientationState,
+                        groupTask.mStagedSplitBounds);
             } else {
                 taskView.bind(groupTask.task1, mOrientationState);
             }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 2be3160c9f..a8c2bc34d0 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -850,7 +850,15 @@ public class TaskView extends FrameLayout implements Reusable {
                 if (confirmSecondSplitSelectApp()) {
                     return;
                 }
-                showTaskMenu(iconView);
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
+                    RecentsView recentsView = getRecentsView();
+                    recentsView.switchToScreenshot(
+                            () -> recentsView.finishRecentsAnimation(true /* toRecents */,
+                                    false /* shouldPip */,
+                                    () -> showTaskMenu(iconView)));
+                } else {
+                    showTaskMenu(iconView);
+                }
             });
             iconView.setOnLongClickListener(v -> {
                 requestDisallowInterceptTouchEvent(true);