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

Commit b755b28b authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[SB Refactor] Don't display the wifi icon if wifi isn't default." into... 

Merge "[SB Refactor] Don't display the wifi icon if wifi isn't default." into tm-qpr-dev am: c23daaa7 am: 2fe46e15

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21937135



Change-Id: I8c7c03dd188d57957f2c3ba7c6cb513dc7a9dc5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aca621c2 2fe46e15

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

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ constructor( 
                    isDefault -> icon

                    wifiConstants.alwaysShowIconIfEnabled -> icon

                    !connectivityConstants.hasDataCapabilities -> icon

                    wifiNetwork is WifiNetworkModel.Active && wifiNetwork.isValidated -> icon

                    // See b/272509965: Even if we have an active and validated wifi network, we

                    // don't want to show the icon if wifi isn't the default network.

                    else -> WifiIcon.Hidden

                }

            }

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

+11 −14
Original line number Diff line number Diff line
@@ -368,40 +368,37 @@ internal class WifiViewModelIconParameterizedTest(private val testCase: TestCase 


                // network = CarrierMerged => not shown

                TestCase(

                    enabled = true,

                    isDefault = true,

                    forceHidden = false,

                    network =

                        WifiNetworkModel.CarrierMerged(NETWORK_ID, subscriptionId = 1, level = 1),

                    expected = null,

                ),



                // network = Inactive => not shown

                // isDefault = false => no networks shown

                TestCase(

                    isDefault = false,

                    network = WifiNetworkModel.Inactive,

                    expected = null,

                ),



                // network = Unavailable => not shown

                TestCase(

                    isDefault = false,

                    network = WifiNetworkModel.Unavailable,

                    expected = null,

                ),



                // network = Active & validated = false => not shown

                TestCase(

                    isDefault = false,

                    network = WifiNetworkModel.Active(NETWORK_ID, isValidated = false, level = 3),

                    expected = null,

                ),



                // network = Active & validated = true => shown

                // Even though this network is active and validated, we still doesn't want it shown

                // because wifi isn't the default connection (b/272509965).

                TestCase(

                    isDefault = false,

                    network = WifiNetworkModel.Active(NETWORK_ID, isValidated = true, level = 4),

                    expected =

                        Expected(

                            iconResource = WIFI_FULL_ICONS[4],

                            contentDescription = { context ->

                                context.getString(WIFI_CONNECTION_STRENGTH[4])

                            },

                            description = "Full internet level 4 icon",

                        ),

                    expected = null,

                ),

            )

    }