commit 92851c50300c4c89ea55130502c646cc3a2dc09d
author Winson Chung <winsonc@google.com> Fri Nov 17 00:29:58 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 17 00:29:58 2023 +0000
tree e8691bd08b6496d8dd774d1eec0f30d6aefe0113
parent 7056e2d2e41bc24130aecc9fca521fca78e2fb15
parent d127c1108be65db5a270626cfb5688e3a7366cd7

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

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

Change-Id: I48a134a3545eb190c4ef085641d0233e68660046
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 2f84ac9..73b786f 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -174,7 +174,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);
                 });