commit b1b41673c907ab7ead6d019d4862fa8371e3e6b4
author Winson Chung <winsonc@google.com> Thu Nov 16 23:26:01 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 16 23:26:01 2023 +0000
tree 0190da338bbfdd9093d9541ba88479c083ce240f
parent f56d690e22336114d529a1e47dd4164abe083699
parent 0c531d5dbbf7f52c9c2530cb7b65f65999e4f645

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

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

Change-Id: Ice293810a5e1cceea3978f6db6efb4ec710ea7fc
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 208f99a..5ac7351 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -171,7 +171,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);
                 });