Merge "Add activity option flag for background starts for bubbles" into udc-dev am: 0dcaf197b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21686310

Change-Id: I1e200083f65a43f47d25c372e46e399e6cac53a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2023-03-04 07:38:43 +00:00
committed by Automerger Merge Worker

View File

@@ -16,6 +16,7 @@
package com.android.wm.shell.bubbles; package com.android.wm.shell.bubbles;
import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.ActivityTaskManager.INVALID_TASK_ID;
import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
@@ -226,6 +227,8 @@ public class BubbleExpandedView extends LinearLayout {
try { try {
options.setTaskAlwaysOnTop(true); options.setTaskAlwaysOnTop(true);
options.setLaunchedFromBubble(true); options.setLaunchedFromBubble(true);
options.setPendingIntentBackgroundActivityStartMode(
MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
Intent fillInIntent = new Intent(); Intent fillInIntent = new Intent();
// Apply flags to make behaviour match documentLaunchMode=always. // Apply flags to make behaviour match documentLaunchMode=always.