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

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

Merge changes I8ce5f791,Id8c23ece into udc-qpr-dev am: 97a0ec41 

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



Change-Id: I1ff5cedc69eb8b46e04f09ed97caa3d1eadaf0f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcb2f119 97a0ec41

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java

+17 −5
Original line number Diff line number Diff line
@@ -15,6 +15,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;
@@ -110,6 +111,9 @@ public class BubbleTaskViewHelper { 
                try {

                    options.setTaskAlwaysOnTop(true);

                    options.setLaunchedFromBubble(true);

                    options.setPendingIntentBackgroundActivityStartMode(

                            MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

                    options.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true);



                    Intent fillInIntent = new Intent();

                    // Apply flags to make behaviour match documentLaunchMode=always.
@@ -117,11 +121,19 @@ public class BubbleTaskViewHelper { 
                    fillInIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);



                    if (mBubble.isAppBubble()) {

                        PendingIntent pi = PendingIntent.getActivity(mContext, 0,

                                mBubble.getAppBubbleIntent(),

                                PendingIntent.FLAG_MUTABLE,

                                null);

                        mTaskView.startActivity(pi, fillInIntent, options, launchBounds);

                        Context context =

                                mContext.createContextAsUser(

                                        mBubble.getUser(), Context.CONTEXT_RESTRICTED);

                        PendingIntent pi = PendingIntent.getActivity(

                                context,

                                /* requestCode= */ 0,

                                mBubble.getAppBubbleIntent()

                                        .addFlags(FLAG_ACTIVITY_NEW_DOCUMENT)

                                        .addFlags(FLAG_ACTIVITY_MULTIPLE_TASK),

                                PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT,

                                /* options= */ null);

                        mTaskView.startActivity(pi, /* fillInIntent= */ null, options,

                                launchBounds);

                    } else if (mBubble.hasMetadataShortcutId()) {

                        options.setApplyActivityFlagsForBubbles(true);

                        mTaskView.startShortcutActivity(mBubble.getShortcutInfo(),