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

Commit 66d6962b authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Avoid launching bubble task in multiple task" into main

parents 089efb6b f5de9b6e

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleTaskViewListenerTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -266,8 +266,6 @@ class BubbleTaskViewListenerTest { 
            optionsCaptor.capture(),

            any())



        assertThat((intentCaptor.lastValue.flags

                and Intent.FLAG_ACTIVITY_MULTIPLE_TASK) != 0).isTrue()

        assertThat(optionsCaptor.lastValue.launchedFromBubble).isFalse() // chat only

        assertThat(optionsCaptor.lastValue.isApplyActivityFlagsForBubbles).isFalse() // chat only

        assertThat(optionsCaptor.lastValue.taskAlwaysOnTop).isTrue()
@@ -295,8 +293,6 @@ class BubbleTaskViewListenerTest { 
            optionsCaptor.capture(),

            any())



        assertThat((intentCaptor.lastValue.flags

                and Intent.FLAG_ACTIVITY_MULTIPLE_TASK) != 0).isTrue()

        assertThat(optionsCaptor.lastValue.launchedFromBubble).isFalse() // chat only

        assertThat(optionsCaptor.lastValue.isApplyActivityFlagsForBubbles).isFalse() // chat only

        assertThat(optionsCaptor.lastValue.taskAlwaysOnTop).isTrue()
@@ -324,8 +320,6 @@ class BubbleTaskViewListenerTest { 
            optionsCaptor.capture(),

            any())



        assertThat((intentCaptor.lastValue.flags

                and Intent.FLAG_ACTIVITY_MULTIPLE_TASK) != 0).isTrue()

        assertThat(optionsCaptor.lastValue.launchedFromBubble).isFalse() // chat only

        assertThat(optionsCaptor.lastValue.isApplyActivityFlagsForBubbles).isFalse() // chat only

        assertThat(optionsCaptor.lastValue.taskAlwaysOnTop).isTrue()

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

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ public class BubbleExpandedView extends LinearLayout { 
                                mContext.createContextAsUser(

                                        mBubble.getUser(), Context.CONTEXT_RESTRICTED);

                        Intent fillInIntent = new Intent();

                        fillInIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);

                        PendingIntent pi = PendingIntent.getActivity(

                                context,

                                /* requestCode= */ 0,

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

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ public class BubbleTaskViewListener implements TaskView.Listener { 
                            mContext.createContextAsUser(

                                    mBubble.getUser(), Context.CONTEXT_RESTRICTED);

                    Intent fillInIntent = new Intent();

                    fillInIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);

                    // First try get pending intent from the bubble

                    PendingIntent pi = mBubble.getPendingIntent();

                    if (pi == null) {