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

Commit 0e63fbbb authored by Jan Láník's avatar Jan Láník Committed by Android (Google) Code Review
Browse files

Merge "Refactor AvControls enablement" into main

parents 8161b2b8 e76d1833

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

+92 −0
Original line number Diff line number Diff line
@@ -16,74 +16,37 @@ 


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



import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

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

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN

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.useUnconfinedTestDispatcher

import com.android.systemui.privacy.PrivacyApplication

import com.android.systemui.privacy.PrivacyItem

import com.android.systemui.privacy.PrivacyType

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

import com.android.systemui.statusbar.data.repository.fakeStatusBarModeRepository

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

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

import com.android.systemui.testKosmos

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

import kotlin.test.Test

import kotlinx.coroutines.flow.first

import org.junit.Before

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

class AvControlsChipInteractorTest() : SysuiTestCase() {

    private val kosmos = testKosmos().useUnconfinedTestDispatcher()

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

class AvControlsChipInteractorImplTest() : AvControlsChipInteractorTestBase() {



    private val cameraItem =

        PrivacyItem(PrivacyType.TYPE_CAMERA, PrivacyApplication("fakepackage", 0))

    private val microphoneItem =

        PrivacyItem(PrivacyType.TYPE_MICROPHONE, PrivacyApplication("fakepackage", 0))



    private fun cameraModel() =

        AvControlsChipModel(SensorActivityModel.Active(SensorActivityModel.Active.Sensors.CAMERA))



    private fun microphoneModel() =

        AvControlsChipModel(

            SensorActivityModel.Active(SensorActivityModel.Active.Sensors.MICROPHONE)

        )



    private fun cameraAndMicrophoneModel() =

        AvControlsChipModel(

            SensorActivityModel.Active(SensorActivityModel.Active.Sensors.CAMERA_AND_MICROPHONE)

        )



    private fun inactiveModel() = AvControlsChipModel(SensorActivityModel.Inactive)



    private fun Kosmos.lastModel(): AvControlsChipModel? =

        collectLastValue(underTest.model).invoke()



    @Before

    fun setUp() {

        kosmos.underTest.initialize()

    @Test

    @EnableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun isCorrectSubclass() =

        kosmos.runTest {

            assertThat(underTest::class.java).isEqualTo(AvControlsChipInteractorImpl::class.java)

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun flagOn_disabled() =

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

    @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 flagOn_enabled() = kosmos.runTest { assertThat(underTest.isEnabled.value).isEqualTo(true) }



    @Test fun defaultModel() = kosmos.runTest { assertThat(lastModel()).isEqualTo(inactiveModel()) }

    fun defaultModelIsInactive() =

        kosmos.runTest { assertThat(lastModel()).isEqualTo(inactiveModel()) }



    @Test

    @EnableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)
@@ -93,14 +56,6 @@ class AvControlsChipInteractorTest() : SysuiTestCase() { 
            assertThat(lastModel()).isEqualTo(cameraModel())

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraActive_flagOff_InactiveModel() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem))

            assertThat(lastModel()).isEqualTo(inactiveModel())

        }



    @Test

    @EnableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun microphoneActiveModel() =
@@ -109,14 +64,6 @@ class AvControlsChipInteractorTest() : SysuiTestCase() { 
            assertThat(lastModel()).isEqualTo(microphoneModel())

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun microphoneActive_flagOff_InactiveModel() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(microphoneItem))

            assertThat(lastModel()).isEqualTo(inactiveModel())

        }



    @Test

    @EnableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraAndMicrophoneActiveModel() =
@@ -125,14 +72,6 @@ class AvControlsChipInteractorTest() : SysuiTestCase() { 
            assertThat(lastModel()).isEqualTo(cameraAndMicrophoneModel())

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraAndMicrophoneActive_flagOff_InactiveModel() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem, microphoneItem))

            assertThat(lastModel()).isEqualTo(inactiveModel())

        }



    @Test

    @EnableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraActive_noFullscreen_shouldSuppressDot() =
@@ -150,22 +89,4 @@ class AvControlsChipInteractorTest() : SysuiTestCase() { 
            fakeStatusBarModeRepository.defaultDisplay.isInFullscreenMode.value = true

            assertThat(underTest.isShowingAvChip.first()).isEqualTo(false)

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraActive_flagOff_noFullscreen_shouldNotSuppressDot() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem))

            fakeStatusBarModeRepository.defaultDisplay.isInFullscreenMode.value = false

            assertThat(underTest.isShowingAvChip.first()).isEqualTo(false)

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraActive_flagOff_fullscreen_shouldNotSuppressDot() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem))

            fakeStatusBarModeRepository.defaultDisplay.isInFullscreenMode.value = true

            assertThat(underTest.isShowingAvChip.first()).isEqualTo(false)

        }

}

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

0 → 100644
+61 −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 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.useUnconfinedTestDispatcher

import com.android.systemui.privacy.PrivacyApplication

import com.android.systemui.privacy.PrivacyItem

import com.android.systemui.privacy.PrivacyType

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

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

import com.android.systemui.testKosmos

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

abstract class AvControlsChipInteractorTestBase() : SysuiTestCase() {

    protected val kosmos = testKosmos().useUnconfinedTestDispatcher()

    protected val Kosmos.underTest by Kosmos.Fixture { avControlsChipInteractor }



    protected val cameraItem =

        PrivacyItem(PrivacyType.TYPE_CAMERA, PrivacyApplication("fakepackage", 0))

    protected val microphoneItem =

        PrivacyItem(PrivacyType.TYPE_MICROPHONE, PrivacyApplication("fakepackage", 0))



    protected fun cameraModel() =

        AvControlsChipModel(SensorActivityModel.Active(SensorActivityModel.Active.Sensors.CAMERA))



    protected fun microphoneModel() =

        AvControlsChipModel(

            SensorActivityModel.Active(SensorActivityModel.Active.Sensors.MICROPHONE)

        )



    protected fun cameraAndMicrophoneModel() =

        AvControlsChipModel(

            SensorActivityModel.Active(SensorActivityModel.Active.Sensors.CAMERA_AND_MICROPHONE)

        )



    protected fun inactiveModel() = AvControlsChipModel(SensorActivityModel.Inactive)



    protected fun Kosmos.lastModel(): AvControlsChipModel? =

        collectLastValue(underTest.model).invoke()

}

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

0 → 100644
+87 −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.platform.test.annotations.DisableFlags

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

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN

import com.android.systemui.kosmos.runTest

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

import com.android.systemui.statusbar.data.repository.fakeStatusBarModeRepository

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

import kotlin.test.Test

import kotlinx.coroutines.flow.first

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

class NoOpAvControlsChipInteractorTest() : AvControlsChipInteractorTestBase() {



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun isCorrectSubclass() =

        kosmos.runTest {

            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() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem))

            assertThat(lastModel()).isEqualTo(inactiveModel())

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun microphoneActive_InactiveModel() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(microphoneItem))

            assertThat(lastModel()).isEqualTo(inactiveModel())

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraAndMicrophoneActive_InactiveModel() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem, microphoneItem))

            assertThat(lastModel()).isEqualTo(inactiveModel())

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraActive_noFullscreen_shouldNotSuppressDot() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem))

            fakeStatusBarModeRepository.defaultDisplay.isInFullscreenMode.value = false

            assertThat(underTest.isShowingAvChip.first()).isEqualTo(false)

        }



    @Test

    @DisableFlags(FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN)

    fun cameraActive_fullscreen_shouldNotSuppressDot() =

        kosmos.runTest {

            fakePrivacyChipRepository.setPrivacyItems(listOf(cameraItem))

            fakeStatusBarModeRepository.defaultDisplay.isInFullscreenMode.value = true

            assertThat(underTest.isShowingAvChip.first()).isEqualTo(false)

        }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/featurepods/av/ui/viewmodel/AvControlsChipViewModelTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.systemui.privacy.PrivacyApplication 
import com.android.systemui.privacy.PrivacyItem

import com.android.systemui.privacy.PrivacyType

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

import com.android.systemui.statusbar.featurepods.av.domain.interactor.avControlsChipInteractorImpl

import com.android.systemui.statusbar.featurepods.popups.ui.model.ChipIcon

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipId

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipModel
@@ -45,7 +44,7 @@ import org.junit.runner.RunWith 
@RunWith(AndroidJUnit4::class)

class AvControlsChipViewModelTest() : SysuiTestCase() {

    private val kosmos = testKosmos().useUnconfinedTestDispatcher()

    private val underTest = kosmos.avControlsChipViewModelFactory.create()

    private lateinit var underTest: AvControlsChipViewModel

    private val cameraItem =

        PrivacyItem(PrivacyType.TYPE_CAMERA, PrivacyApplication("fakepackage", 0))

    private val microphoneItem =
@@ -53,7 +52,7 @@ class AvControlsChipViewModelTest() : SysuiTestCase() { 


    @Before

    fun setUp() {

        kosmos.avControlsChipInteractorImpl.initialize()

        underTest = kosmos.avControlsChipViewModelFactory.create()

        underTest.activateIn(kosmos.testScope)

    }

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+1 −1
Original line number Diff line number Diff line
@@ -220,12 +220,12 @@ import javax.inject.Named; 
@Module(includes = {

        ActivityManagerModule.class,

        AmbientModule.class,

        AvControlsChipModule.class,

        AppOpsModule.class,

        AirplaneModeDataLayerModule.class,

        AirplaneModeSharedModule.class,

        AssistModule.class,

        AuthenticationModule.class,

        AvControlsChipModule.class,

        BiometricsModule.class,

        BiometricsDomainLayerModule.class,

        BouncerInteractorModule.class,