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

Commit f402a122 authored by Jan Lanik's avatar Jan Lanik
Browse files

AV feature callback 

Passing AV feature callback into the interactor

Flag: com.android.systemui.desktop_av_controls_popup
Bug: 436221475
Test: Unit tests
Change-Id: Ifb046e0b5dff38ef0b7e6fa5baf2862cfb1d6902
parent d0d82558

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/SystemEventCoordinatorTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.systemui.util.mockito.argThat 
import com.android.systemui.util.time.FakeSystemClock

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.MutableSharedFlow

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.UnconfinedTestDispatcher

import kotlinx.coroutines.test.runTest
@@ -51,7 +50,6 @@ import org.mockito.Mock 
import org.mockito.Mockito.times

import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyNoMoreInteractions

import org.mockito.Mockito.`when`

import org.mockito.MockitoAnnotations

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters
@@ -105,7 +103,6 @@ class SystemEventCoordinatorTest(flags: FlagsParameterization) : SysuiTestCase() 
                    logcatLogBuffer("SystemEventCoordinatorTest"),

                )

                .apply { attachScheduler(scheduler) }

        `when`(avControlsChipInteractor.isEnabled).thenReturn(MutableStateFlow(false))

    }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/featurepods/av/domain/interactor/AvControlsChipInteractorImplTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ class AvControlsChipInteractorImplTest() : AvControlsChipInteractorTestBase() { 
            assertThat(underTest::class.java).isEqualTo(AvControlsChipInteractorImpl::class.java)

        }



    @Test

    @EnableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun enabled() = kosmos.runTest { assertThat(underTest.isEnabled.value).isEqualTo(true) }



    @Test

    @EnableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun defaultModelIsInactive() =

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/featurepods/av/domain/interactor/DesktopEffectInteractorTest.kt

0 → 100644
+268 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.featurepods.av.domain.interactor



import android.content.pm.UserInfo

import android.testing.TestableLooper.RunWithLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.collectLastValue

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.statusbar.featurepods.av.domain.interactor.DesktopEffectInteractor.Companion.DESKTOP_EFFECTS_BLUR_LEVEL_KEY

import com.android.systemui.statusbar.featurepods.av.domain.interactor.DesktopEffectInteractor.Companion.DESKTOP_EFFECTS_FACE_RETOUCH_KEY

import com.android.systemui.statusbar.featurepods.av.domain.interactor.DesktopEffectInteractor.Companion.DESKTOP_EFFECTS_PORTRAIT_RELIGHT_KEY

import com.android.systemui.statusbar.featurepods.av.domain.interactor.DesktopEffectInteractor.Companion.DESKTOP_EFFECTS_STUDIO_MIC_KEY

import com.android.systemui.statusbar.featurepods.av.shared.model.BlurLevel

import com.android.systemui.statusbar.featurepods.av.shared.model.DesktopEffectModel

import com.android.systemui.testKosmos

import com.android.systemui.user.data.repository.fakeUserRepository

import com.android.systemui.util.settings.fakeSettings

import com.google.common.truth.Truth.assertThat

import kotlin.test.Test

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.launch

import org.junit.Before

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

@RunWithLooper

@ExperimentalCoroutinesApi

class DesktopEffectInteractorTest : SysuiTestCase() {

    private val kosmos = testKosmos().useUnconfinedTestDispatcher()

    private val Kosmos.underTest by Kosmos.Fixture { desktopEffectInteractor }

    private val latest by kosmos.collectLastValue(kosmos.underTest.model)



    private val FIRST_USER = UserInfo(100, "first user", 0)

    private val SECOND_USER = UserInfo(200, "second user", 0)



    @Before

    fun setUp() {

        kosmos.fakeUserRepository.setUserInfos(listOf(FIRST_USER, SECOND_USER))

        kosmos.testScope.launch { kosmos.fakeUserRepository.setSelectedUserInfo(FIRST_USER) }

    }



    @Test

    fun initialValue() =

        kosmos.runTest {

            assertThat(latest).isEqualTo(DesktopEffectModel())

            assertThat(latest)

                .isEqualTo(

                    DesktopEffectModel(

                        portraitRelight = false,

                        faceRetouch = false,

                        studioMic = false,

                        blurLevel = BlurLevel.OFF,

                    )

                )

        }



    @Test

    fun receivePortraitRelight() =

        kosmos.runTest {

            assertThat(latest!!.portraitRelight)

                .isEqualTo(false)



            fakeSettings.putBoolForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_PORTRAIT_RELIGHT_KEY,

                value = true,

            )



            assertThat(latest!!.portraitRelight).isEqualTo(true)



            fakeSettings.putBoolForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_PORTRAIT_RELIGHT_KEY,

                value = false,

            )



            assertThat(latest!!.portraitRelight)

                .isEqualTo(false)

        }



    @Test

    fun receiveFaceRetouch() =

        kosmos.runTest {

            assertThat(latest!!.faceRetouch).isEqualTo(false)



            fakeSettings.putBoolForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_FACE_RETOUCH_KEY,

                value = true,

            )



            assertThat(latest!!.faceRetouch).isEqualTo(true)



            fakeSettings.putBoolForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_FACE_RETOUCH_KEY,

                value = false,

            )



            assertThat(latest!!.faceRetouch).isEqualTo(false)

        }



    @Test

    fun receiveStudioMic() =

        kosmos.runTest {

            assertThat(latest!!.studioMic).isEqualTo(false)



            fakeSettings.putBoolForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_STUDIO_MIC_KEY,

                value = true,

            )



            assertThat(latest!!.studioMic).isEqualTo(true)



            fakeSettings.putBoolForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_STUDIO_MIC_KEY,

                value = false,

            )



            assertThat(latest!!.studioMic)

        }



    @Test

    fun receiveBlurLevel() =

        kosmos.runTest {

            assertThat(latest!!.blurLevel)

                .isEqualTo(BlurLevel.OFF)



            fakeSettings.putIntForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_BLUR_LEVEL_KEY,

                value = BlurLevel.LIGHT.code,

            )



            assertThat(latest!!.blurLevel)

                .isEqualTo(BlurLevel.LIGHT)



            fakeSettings.putIntForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_BLUR_LEVEL_KEY,

                value = BlurLevel.FULL.code,

            )



            assertThat(latest!!.blurLevel)

                .isEqualTo(BlurLevel.FULL)



            fakeSettings.putIntForUser(

                userHandle = FIRST_USER.id,

                name = DESKTOP_EFFECTS_BLUR_LEVEL_KEY,

                value = BlurLevel.OFF.code,

            )



            assertThat(latest!!.blurLevel)

                .isEqualTo(BlurLevel.OFF)

        }



    @Test

    fun setPortraitRelight_propagatesUpAndBack() =

        kosmos.runTest {

            underTest.setPortraitRelight(true)



            assertThat(latest!!.portraitRelight).isEqualTo(true)

            assertThat(

                    fakeSettings.getBoolForUser(

                        DESKTOP_EFFECTS_PORTRAIT_RELIGHT_KEY,

                        false,

                        FIRST_USER.id,

                    )

                )

                .isEqualTo(true)

        }



    @Test

    fun setFaceRetouch_propagatesUpAndBack() =

        kosmos.runTest {

            underTest.setFaceRetouch(true)



            assertThat(latest!!.faceRetouch).isEqualTo(true)

            assertThat(

                    fakeSettings.getBoolForUser(

                        DESKTOP_EFFECTS_FACE_RETOUCH_KEY,

                        false,

                        FIRST_USER.id,

                    )

                )

                .isEqualTo(true)

        }



    @Test

    fun setStudioMic_propagatesUpAndBack() =

        kosmos.runTest {

            underTest.setStudioMic(true)



            assertThat(latest!!.studioMic).isEqualTo(true)

            assertThat(

                    fakeSettings.getBoolForUser(

                        DESKTOP_EFFECTS_STUDIO_MIC_KEY,

                        false,

                        FIRST_USER.id,

                    )

                )

                .isEqualTo(true)

        }



    @Test

    fun setBlurLevel_propagatesUpAndBack() =

        kosmos.runTest {

            underTest.setBlurLevel(BlurLevel.LIGHT)



            assertThat(latest!!.blurLevel)

                .isEqualTo(BlurLevel.LIGHT)

            assertThat(

                    fakeSettings.getIntForUser(

                        DESKTOP_EFFECTS_BLUR_LEVEL_KEY,

                        BlurLevel.OFF.code,

                        FIRST_USER.id,

                    )

                )

                .isEqualTo(BlurLevel.LIGHT.code)

        }



    @Test

    fun switchUser_resetsToInitialValue() =

        kosmos.runTest {

            assertThat(collectLastValue(underTest.model).invoke()).isEqualTo(DesktopEffectModel())

            val newModel =

                DesktopEffectModel(

                    portraitRelight = true,

                    faceRetouch = true,

                    studioMic = true,

                    blurLevel = BlurLevel.FULL,

                )



            underTest.setPortraitRelight(newModel.portraitRelight)

            underTest.setFaceRetouch(newModel.faceRetouch)

            underTest.setBlurLevel(newModel.blurLevel)

            underTest.setStudioMic(newModel.studioMic)



            assertThat(latest).isEqualTo(newModel)



            fakeUserRepository.setSelectedUserInfo(SECOND_USER)



            assertThat(latest).isEqualTo(DesktopEffectModel())

        }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/featurepods/av/domain/interactor/NoOpAvControlsChipInteractorTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ class NoOpAvControlsChipInteractorTest() : AvControlsChipInteractorTestBase() { 
            assertThat(underTest::class.java).isEqualTo(NoOpAvControlsChipInteractor::class.java)

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun disabled() = kosmos.runTest { assertThat(underTest.isEnabled.value).isEqualTo(false) }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraActive_InactiveModel() =

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ constructor( 
    fun notifyPrivacyItemsChanged(showAnimation: Boolean = true) {

        // Disabling animation in case that the privacy indicator is implemented as a status bar

        // chip

        val shouldShowAnimation = showAnimation && !avControlsChipInteractor.isEnabled.value

        val shouldShowAnimation = showAnimation && !Flags.expandedPrivacyIndicatorsOnLargeScreen()

        val event = PrivacyEvent(shouldShowAnimation)

        event.privacyItems = privacyStateListener.currentPrivacyItems

        event.contentDescription = run {