commit 185da72e98c529ceabd57f3bc73d596acc552ff6
author Vinit Nayak <peanutbutter@google.com> Thu Nov 11 06:03:47 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 11 06:03:47 2021 +0000
tree 35c98e5e1ab067d94ee5bcbdd2723c462d93adea
parent b6e3caeb7a5bf7cfc3ab7d5c0d87590473629634
parent 2db58f68ee25f3551313bf6df14b6f7817fd3434

Merge "Finish recents animation for app-icon tap" into sc-v2-dev

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 1d01b7a..72e01bb 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1343,8 +1343,12 @@
             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);
             }

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

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 8996127..62aa73d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -851,7 +851,15 @@
                 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);