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

Commit 4dc61922 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

[flexiglass] FakeSceneContainerFlags.enabled defaults to SceneContainerFlag.isEnabled 

Bug: 333132830
Test: atest SystemUITest
Test: atest SystemUiRoboTest
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: Ie93edfa5e11dde76b66d67186a6cb6727a8c549c
parent 25e1399e

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import org.junit.runner.RunWith 


@SmallTest

@RunWith(AndroidJUnit4::class)

@android.platform.test.annotations.EnabledOnRavenwood

class SceneContainerRepositoryTest : SysuiTestCase() {



    private val kosmos = testKosmos().apply { fakeSceneContainerFlags.enabled = true }

packages/SystemUI/tests/src/com/android/systemui/scene/shared/flag/SceneContainerFlagsTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/scene/shared/flag/SceneContainerFlagsTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.Flags.FLAG_SCENE_CONTAINER

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.kosmos.Kosmos

import com.google.common.truth.Truth

import org.junit.Test

import org.junit.runner.RunWith
@@ -35,6 +36,7 @@ internal class SceneContainerFlagsTest : SysuiTestCase() { 
    fun isNotEnabled_withoutAconfigFlags() {

        Truth.assertThat(SceneContainerFlag.isEnabled).isEqualTo(false)

        Truth.assertThat(SceneContainerFlagsImpl().isEnabled()).isEqualTo(false)

        Truth.assertThat(Kosmos().sceneContainerFlags.isEnabled()).isEqualTo(false)

    }



    @Test
@@ -42,5 +44,6 @@ internal class SceneContainerFlagsTest : SysuiTestCase() { 
    fun isEnabled_withAconfigFlags() {

        Truth.assertThat(SceneContainerFlag.isEnabled).isEqualTo(true)

        Truth.assertThat(SceneContainerFlagsImpl().isEnabled()).isEqualTo(true)

        Truth.assertThat(Kosmos().sceneContainerFlags.isEnabled()).isEqualTo(true)

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt

+11 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.common.shared.model.NotificationContainerBounds 
import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.BrokenWithSceneContainer

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.Flags

import com.android.systemui.flags.andSceneContainer
@@ -50,6 +51,8 @@ import com.android.systemui.keyguard.ui.viewmodel.aodBurnInViewModel 
import com.android.systemui.keyguard.ui.viewmodel.keyguardRootViewModel

import com.android.systemui.kosmos.testScope

import com.android.systemui.res.R

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.flag.sceneContainerFlags

import com.android.systemui.shade.data.repository.shadeRepository

import com.android.systemui.shade.mockLargeScreenHeaderHelper

import com.android.systemui.statusbar.notification.stack.domain.interactor.sharedNotificationContainerInteractor
@@ -128,6 +131,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 


    @Before

    fun setUp() {

        assertThat(kosmos.sceneContainerFlags.isEnabled()).isEqualTo(SceneContainerFlag.isEnabled)

        overrideResource(R.bool.config_use_split_notification_shade, false)

        movementFlow = MutableStateFlow(BurnInModel())

        whenever(aodBurnInViewModel.movement(any())).thenReturn(movementFlow)
@@ -313,6 +317,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 
        }



    @Test

    @BrokenWithSceneContainer(bugId = 333132830)

    fun glanceableHubAlpha_lockscreenToHub() =

        testScope.runTest {

            val alpha by collectLastValue(underTest.glanceableHubAlpha)
@@ -462,6 +467,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 
        }



    @Test

    @BrokenWithSceneContainer(bugId = 333132830)

    fun isOnLockscreenWithoutShade() =

        testScope.runTest {

            val isOnLockscreenWithoutShade by collectLastValue(underTest.isOnLockscreenWithoutShade)
@@ -498,6 +504,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 
        }



    @Test

    @BrokenWithSceneContainer(bugId = 333132830)

    fun isOnGlanceableHubWithoutShade() =

        testScope.runTest {

            val isOnGlanceableHubWithoutShade by
@@ -679,6 +686,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 
        }



    @Test

    @BrokenWithSceneContainer(bugId = 333132830)

    fun maxNotificationsOnLockscreen_DoesNotUpdateWhenUserInteracting() =

        testScope.runTest {

            var notificationCount = 10
@@ -715,6 +723,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 
        }



    @Test

    @BrokenWithSceneContainer(bugId = 333132830)

    fun maxNotificationsOnShade() =

        testScope.runTest {

            val calculateSpace = { space: Float, useExtraShelfSpace: Boolean -> 10 }
@@ -801,6 +810,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 
        }



    @Test

    @BrokenWithSceneContainer(bugId = 333132830)

    fun alphaOnFullQsExpansion() =

        testScope.runTest {

            val viewState = ViewStateAccessor()
@@ -908,6 +918,7 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization?) : 
        }



    @Test

    @BrokenWithSceneContainer(bugId = 333132830)

    fun shadeCollapseFadeIn() =

        testScope.runTest {

            val fadeIn by collectValues(underTest.shadeCollapseFadeIn)

packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/flag/FakeSceneContainerFlags.kt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import dagger.Module 
import dagger.Provides



class FakeSceneContainerFlags(

    var enabled: Boolean = false,

    var enabled: Boolean = SceneContainerFlag.isEnabled,

) : SceneContainerFlags {



    override fun isEnabled(): Boolean {