Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b56b7fda authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Add activity option flag for background starts for bubbles" into...

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

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



Change-Id: I04475647c786f99193313400cf9a2f2195fe65cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8576ee2 00285ff0
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

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.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
@@ -226,6 +227,8 @@ public class BubbleExpandedView extends LinearLayout {
                try {
                    options.setTaskAlwaysOnTop(true);
                    options.setLaunchedFromBubble(true);
                    options.setPendingIntentBackgroundActivityStartMode(
                            MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

                    Intent fillInIntent = new Intent();
                    // Apply flags to make behaviour match documentLaunchMode=always.