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

Commit 8a06307a authored by Matt Pietal's avatar Matt Pietal
Browse files

Only enable ambient wallpaper if AOD is also enabled 

It doesn't make sense to have the flow emit true if AOD is
also disabled.

Bug: 424116198
Test: atest WallpaperRepositoryImplTest
Flag: EXEMPT bugfix
Change-Id: I82eca452299309c91194c4f517ea85e9d72c411c
parent 955d16ff

packages/SystemUI/multivalentTests/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryImplTest.kt

+22 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { 
    fun wallpaperSupportsAmbientMode_deviceDoesNotSupport_false() =

        testScope.runTest {

            underTest = kosmos.wallpaperRepository

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON, 1)

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1)

            context.orCreateTestableResources.addOverride(

                R.bool.config_dozeSupportsAodWallpaper,
@@ -252,6 +253,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { 
    fun wallpaperSupportsAmbientMode_sysuiOverrideFalse_deviceDoesSupport_false() =

        testScope.runTest {

            underTest = kosmos.wallpaperRepository

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON, 1)

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1)

            context.orCreateTestableResources.addOverride(

                R.bool.config_dozeSupportsAodWallpaper,
@@ -271,6 +273,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { 
    fun wallpaperSupportsAmbientMode_sysuiOverrideTrue_deviceDoesSupport_true() =

        testScope.runTest {

            underTest = kosmos.wallpaperRepository

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON, 1)

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1)

            context.orCreateTestableResources.addOverride(

                R.bool.config_dozeSupportsAodWallpaper,
@@ -290,6 +293,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { 
    fun wallpaperSupportsAmbientMode_sysuiOverrideNull_deviceDoesSupport_true() =

        testScope.runTest {

            underTest = kosmos.wallpaperRepository

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON, 1)

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1)

            context.orCreateTestableResources.addOverride(

                R.bool.config_dozeSupportsAodWallpaper,
@@ -309,6 +313,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { 
    fun wallpaperSupportsAmbientMode_deviceDoesSupport_true() =

        testScope.runTest {

            underTest = kosmos.wallpaperRepository

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON, 1)

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1)

            context.orCreateTestableResources.addOverride(

                R.bool.config_dozeSupportsAodWallpaper,
@@ -332,6 +337,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { 
    fun wallpaperSupportsAmbientMode_deviceDoesSupport_settingDisabled_false() =

        testScope.runTest {

            underTest = kosmos.wallpaperRepository

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON, 1)

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 0)

            context.orCreateTestableResources.addOverride(

                R.bool.config_dozeSupportsAodWallpaper,
@@ -342,6 +348,22 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { 
            assertThat(latest).isFalse()

        }



    @Test

    @EnableFlags(SharedFlags.FLAG_AMBIENT_AOD)

    fun wallpaperSupportsAmbientMode_deviceDoesSupport_userDisabledAod_false() =

        testScope.runTest {

            underTest = kosmos.wallpaperRepository

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON, 0)

            secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1)

            context.orCreateTestableResources.addOverride(

                R.bool.config_dozeSupportsAodWallpaper,

                false,

            )

            configRepository.onAnyConfigurationChange()

            val latest by collectLastValue(underTest.wallpaperSupportsAmbientMode)

            assertThat(latest).isFalse()

        }



    @Test

    @EnableFlags(SharedFlags.FLAG_EXTENDED_WALLPAPER_EFFECTS)

    fun shouldSendNotificationLayout_setExtendedEffectsWallpaper() =

packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt

+7 −3
Original line number Diff line number Diff line
@@ -128,13 +128,17 @@ constructor( 
                        Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED,

                    )

                    .onStart { emit(Unit) },

                secureSettings

                    .observerFlow(UserHandle.USER_ALL, Settings.Secure.DOZE_ALWAYS_ON)

                    .onStart { emit(Unit) },

                configurationInteractor.onAnyConfigurationChange,

                ::Pair,

                ::Triple,

            )

            .map {

                val userEnabled =

                val aodEnabled = secureSettings.getInt(Settings.Secure.DOZE_ALWAYS_ON, 0) == 1

                val wallpaperEnabled =

                    secureSettings.getInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1) == 1

                userEnabled && configEnabled() && ambientAod()

                aodEnabled && wallpaperEnabled && configEnabled() && ambientAod()

            }

            .flowOn(bgDispatcher)