commit d127c1108be65db5a270626cfb5688e3a7366cd7
author Winson Chung <winsonc@google.com> Thu Nov 16 23:58:07 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 16 23:58:07 2023 +0000
tree 043a27bbaa1136de8a49f335b2a6cfdc655ec36a
parent 6cc2a50548c22b079ffa657db1dfcb44f48dc071
parent f3eb5388d1e28c8a66ae4ce6529d453e6528ee68

Merge "Don't open PiP when freeform is opened from recent" into main am: 0c531d5dbb am: f3eb5388d1

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2743811

Change-Id: If62d1d831854acf9b5ec2e8c27458594e72bba27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/quickstep/TaskShortcutFactory.java

diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 901690b..d82120f 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -172,7 +172,7 @@
             dismissTaskMenuView(mTarget);
             RecentsView rv = mTarget.getOverviewPanel();
             rv.switchToScreenshot(() -> {
-                rv.finishRecentsAnimation(true /* toHome */, () -> {
+                rv.finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, () -> {
                     mTarget.returnToHomescreen();
                     rv.getHandler().post(this::startActivity);
                 });