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

Commit a496a7fa authored by Mady Mellor's avatar Mady Mellor
Browse files

Don't block disable launch adjacent on bubble anything, use create flag 

Flag: com.android.wm.shell.enable_create_any_bubble
Test: atest BubbleUtilsTest
Test: manual - create a gmail bubble and tap on a link, the link should
               open as a new bubble
Bug: 415707322
Change-Id: Ic9d50eac2cd7a2286fa0e8b0809110f0f796947b
parent fecb36ff

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/util/BubbleUtils.kt

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ private fun getBubbleTransaction( 
    if (Flags.disallowBubbleToEnterPip()) {

        wct.setDisablePip(token, toBubble /* disablePip */)

    }

    if (BubbleAnythingFlagHelper.enableBubbleAnything()) {

    if (BubbleAnythingFlagHelper.enableCreateAnyBubble()) {

        wct.setDisableLaunchAdjacent(token, toBubble /* disableLaunchAdjacent */)

    }

    return wct

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/util/BubbleUtilsTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.window.WindowContainerToken 
import androidx.test.filters.SmallTest

import com.android.window.flags.Flags.FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP

import com.android.window.flags.Flags.FLAG_EXCLUDE_TASK_FROM_RECENTS

import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_ANYTHING

import com.android.wm.shell.Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE

import com.android.wm.shell.ShellTestCase

import com.google.testing.junit.testparameterinjector.TestParameter

import com.google.testing.junit.testparameterinjector.TestParameterInjector
@@ -47,7 +47,7 @@ class BubbleUtilsTest : ShellTestCase() { 
    }



    @EnableFlags(

        FLAG_ENABLE_BUBBLE_ANYTHING,

        FLAG_ENABLE_CREATE_ANY_BUBBLE,

        FLAG_EXCLUDE_TASK_FROM_RECENTS,

        FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP,

    )
@@ -59,7 +59,7 @@ class BubbleUtilsTest : ShellTestCase() { 
    }



    @EnableFlags(

        FLAG_ENABLE_BUBBLE_ANYTHING,

        FLAG_ENABLE_CREATE_ANY_BUBBLE,

        FLAG_EXCLUDE_TASK_FROM_RECENTS,

        FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP,

    )