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

Commit bcfa7ada authored by Evan Laird's avatar Evan Laird
Browse files

[Sb refactor] Move shouldShowActivityConfig to ConnectivityConstants 

This field was needed both for mobile and wifi. This CL updates the wifi
pipeline to use the `ConnectivityConstants` version to keep things
centralized.

Test: WifiViewModelTest
Bug: 238425913
Change-Id: Ia681c648a10c1daba48916ca48a41e0aec236a79
parent 09ae54f5

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiConstants.kt

+0 −4
Original line number Diff line number Diff line
@@ -38,16 +38,12 @@ class WifiConstants @Inject constructor( 
        dumpManager.registerDumpable("${SB_LOGGING_TAG}WifiConstants", this)

    }



    /** True if we should show the activityIn/activityOut icons and false otherwise. */

    val shouldShowActivityConfig = context.resources.getBoolean(R.bool.config_showActivity)



    /** True if we should always show the wifi icon when wifi is enabled and false otherwise. */

    val alwaysShowIconIfEnabled =

        context.resources.getBoolean(R.bool.config_showWifiIndicatorWhenEnabled)



    override fun dump(pw: PrintWriter, args: Array<out String>) {

        pw.apply {

            println("shouldShowActivityConfig=$shouldShowActivityConfig")

            println("alwaysShowIconIfEnabled=$alwaysShowIconIfEnabled")

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ constructor( 


    /** The wifi activity status. Null if we shouldn't display the activity status. */

    private val activity: Flow<DataActivityModel?> =

        if (!wifiConstants.shouldShowActivityConfig) {

        if (!connectivityConstants.shouldShowActivityConfig) {

            flowOf(null)

        } else {

            combine(interactor.activity, interactor.ssid) { activity, ssid ->

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt

+12 −12
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activity_showActivityConfigFalse_outputsFalse() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(false)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(false)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -183,7 +183,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activity_showActivityConfigFalse_noUpdatesReceived() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(false)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(false)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -225,7 +225,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activity_nullSsid_outputsFalse() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()



        wifiRepository.setWifiNetwork(WifiNetworkModel.Active(NETWORK_ID, ssid = null))
@@ -268,7 +268,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activity_allLocationViewModelsReceiveSameData() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -308,7 +308,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityIn_hasActivityInTrue_outputsTrue() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -330,7 +330,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityIn_hasActivityInFalse_outputsFalse() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -352,7 +352,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityOut_hasActivityOutTrue_outputsTrue() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -374,7 +374,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityOut_hasActivityOutFalse_outputsFalse() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -396,7 +396,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityContainer_hasActivityInTrue_outputsTrue() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -418,7 +418,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityContainer_hasActivityOutTrue_outputsTrue() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -440,7 +440,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityContainer_inAndOutTrue_outputsTrue() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -462,7 +462,7 @@ class WifiViewModelTest : SysuiTestCase() { 


    @Test

    fun activityContainer_inAndOutFalse_outputsFalse() = runBlocking(IMMEDIATE) {

        whenever(wifiConstants.shouldShowActivityConfig).thenReturn(true)

        whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

        createAndSetViewModel()

        wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)