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

Commit 12262f14 authored by Evan Laird's avatar Evan Laird
Browse files

[Sat] Update device-based carrier string 

Previously, the text was "Connected to satellite" / "Not connected to
satellite". Now we show a single "Satellite SOS" carrier text when the
radio is on, despite its current connection state.

Test: DeviceBasedSatelliteViewModelTest
Test: manual via demo mode
Bug: 336293844
Flag: ACONFIG com.android.internal.telephony.flags.oem_enabled_satellite_flag NEXTFOOD
Change-Id: I281baf8bd721c5259aa4c88ac9e96efa60536e17
parent 0f450e71

packages/SystemUI/res/values/strings.xml

+1 −3
Original line number Diff line number Diff line
@@ -1719,9 +1719,7 @@ 
    <string name="accessibility_status_bar_satellite_available">Satellite, connection available</string>



    <!-- Text displayed indicating that the user is connected to a satellite signal. -->

    <string name="satellite_connected_carrier_text">Connected to satellite</string>

    <!-- Text displayed indicating that the user is not connected to a satellite signal. -->

    <string name="satellite_not_connected_carrier_text">Not connected to satellite</string>

    <string name="satellite_connected_carrier_text">Satellite SOS</string>



    <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->

    <string name="accessibility_managed_profile">Work profile</string>

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModel.kt

+1 −2
Original line number Diff line number Diff line
@@ -126,10 +126,9 @@ constructor( 
            ) { shouldShow, connectionState ->

                if (shouldShow) {

                    when (connectionState) {

                        SatelliteConnectionState.On,

                        SatelliteConnectionState.Connected ->

                            context.getString(R.string.satellite_connected_carrier_text)

                        SatelliteConnectionState.On ->

                            context.getString(R.string.satellite_not_connected_carrier_text)

                        SatelliteConnectionState.Off,

                        SatelliteConnectionState.Unknown -> null

                    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { 
            advanceTimeBy(10.seconds)



            assertThat(latest)

                .isEqualTo(context.getString(R.string.satellite_not_connected_carrier_text))

                .isEqualTo(context.getString(R.string.satellite_connected_carrier_text))

        }



    @OptIn(ExperimentalCoroutinesApi::class)