Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[SB Refactor] Show ! on mobile triangle if the connection failed." into udc-dev

Browse Source
This commit is contained in:
Caitlin Shkuratov
2023-04-07 13:56:57 +00:00
committed by Android (Google) Code Review
parent 6a22021446 54a7debb5c
commit 53bbef53d4
2 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt
View File

@@ -37,7 +37,6 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.stateIn
/** Common interface for all of the location-based mobile icon view models. */
@@ -80,7 +79,12 @@ constructor(
) : MobileIconViewModelCommon {
/** Whether or not to show the error state of [SignalDrawable] */
private val showExclamationMark: Flow<Boolean> =
iconInteractor.isDefaultDataEnabled.mapLatest { !it }
combine(
iconInteractor.isDefaultDataEnabled,
iconInteractor.isDefaultConnectionFailed,
) { isDefaultDataEnabled, isDefaultConnectionFailed ->
!isDefaultDataEnabled || isDefaultConnectionFailed
}
override val isVisible: StateFlow<Boolean> =
if (!constants.hasDataCapabilities) {

72
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt
View File

@@ -179,15 +179,71 @@ class MobileIconViewModelTest : SysuiTestCase() {
}
@Test
fun iconId_cutout_whenDefaultDataDisabled() =
fun icon_usesLevelFromInteractor() =
testScope.runTest {
var latest: SignalIconModel? = null
val job = underTest.icon.onEach { latest = it }.launchIn(this)
interactor.level.value = 3
assertThat(latest!!.level).isEqualTo(3)
interactor.level.value = 1
assertThat(latest!!.level).isEqualTo(1)
job.cancel()
}
@Test
fun icon_usesNumberOfLevelsFromInteractor() =
testScope.runTest {
var latest: SignalIconModel? = null
val job = underTest.icon.onEach { latest = it }.launchIn(this)
interactor.numberOfLevels.value = 5
assertThat(latest!!.numberOfLevels).isEqualTo(5)
interactor.numberOfLevels.value = 2
assertThat(latest!!.numberOfLevels).isEqualTo(2)
job.cancel()
}
@Test
fun icon_defaultDataDisabled_showExclamationTrue() =
testScope.runTest {
interactor.setIsDefaultDataEnabled(false)
var latest: SignalIconModel? = null
val job = underTest.icon.onEach { latest = it }.launchIn(this)
val expected = defaultSignal(level = 1, connected = false)
assertThat(latest).isEqualTo(expected)
assertThat(latest!!.showExclamationMark).isTrue()
job.cancel()
}
@Test
fun icon_defaultConnectionFailed_showExclamationTrue() =
testScope.runTest {
interactor.isDefaultConnectionFailed.value = true
var latest: SignalIconModel? = null
val job = underTest.icon.onEach { latest = it }.launchIn(this)
assertThat(latest!!.showExclamationMark).isTrue()
job.cancel()
}
@Test
fun icon_enabledAndNotFailed_showExclamationFalse() =
testScope.runTest {
interactor.setIsDefaultDataEnabled(true)
interactor.isDefaultConnectionFailed.value = false
var latest: SignalIconModel? = null
val job = underTest.icon.onEach { latest = it }.launchIn(this)
assertThat(latest!!.showExclamationMark).isFalse()
job.cancel()
}
@@ -572,16 +628,14 @@ class MobileIconViewModelTest : SysuiTestCase() {
companion object {
private const val SUB_1_ID = 1
private const val NUM_LEVELS = 4
/** Convenience constructor for these tests */
fun defaultSignal(
level: Int = 1,
connected: Boolean = true,
): SignalIconModel {
return SignalIconModel(level, numberOfLevels = 4, showExclamationMark = !connected)
fun defaultSignal(level: Int = 1): SignalIconModel {
return SignalIconModel(level, NUM_LEVELS, showExclamationMark = false)
}
fun emptySignal(): SignalIconModel =
SignalIconModel(level = 0, numberOfLevels = 4, showExclamationMark = true)
SignalIconModel(level = 0, numberOfLevels = NUM_LEVELS, showExclamationMark = true)
}
}