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

Merge "Show wallet option in picker even if not set up." into tm-qpr-dev

Browse Source
This commit is contained in:
Ale Nijamkin
2023-01-19 00:50:03 +00:00
committed by Android (Google) Code Review
parent 4c1411e09b bd86eae9a8
commit 324ae34008
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt
View File

@@ -100,9 +100,9 @@ constructor(
override suspend fun getPickerScreenState(): KeyguardQuickAffordanceConfig.PickerScreenState { override suspend fun getPickerScreenState(): KeyguardQuickAffordanceConfig.PickerScreenState {
return when { return when {
!walletController.isWalletEnabled -> !walletController.walletClient.isWalletServiceAvailable ->
KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice
walletController.walletClient.tileIcon == null || queryCards().isEmpty() -> { !walletController.isWalletEnabled || queryCards().isEmpty() -> {
val componentName = val componentName =
walletController.walletClient.createWalletSettingsIntent().toComponentName() walletController.walletClient.createWalletSettingsIntent().toComponentName()
val actionText = val actionText =

32
packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt
View File

@@ -113,21 +113,9 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() {
job.cancel() job.cancel()
} }
@Test
fun `affordance - missing icon - model is none`() = runBlockingTest {
setUpState(hasWalletIcon = false)
var latest: KeyguardQuickAffordanceConfig.LockScreenState? = null
val job = underTest.lockScreenState.onEach { latest = it }.launchIn(this)
assertThat(latest).isEqualTo(KeyguardQuickAffordanceConfig.LockScreenState.Hidden)
job.cancel()
}
@Test @Test
fun `affordance - no selected card - model is none`() = runBlockingTest { fun `affordance - no selected card - model is none`() = runBlockingTest {
setUpState(hasWalletIcon = false) setUpState(hasSelectedCard = false)
var latest: KeyguardQuickAffordanceConfig.LockScreenState? = null var latest: KeyguardQuickAffordanceConfig.LockScreenState? = null
val job = underTest.lockScreenState.onEach { latest = it }.launchIn(this) val job = underTest.lockScreenState.onEach { latest = it }.launchIn(this)
@@ -165,7 +153,7 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() {
@Test @Test
fun `getPickerScreenState - unavailable`() = runTest { fun `getPickerScreenState - unavailable`() = runTest {
setUpState( setUpState(
isWalletEnabled = false, isWalletServiceAvailable = false,
) )
assertThat(underTest.getPickerScreenState()) assertThat(underTest.getPickerScreenState())
@@ -173,9 +161,9 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() {
} }
@Test @Test
fun `getPickerScreenState - disabled when there is no icon`() = runTest { fun `getPickerScreenState - disabled when the feature is not enabled`() = runTest {
setUpState( setUpState(
hasWalletIcon = false, isWalletEnabled = false,
) )
assertThat(underTest.getPickerScreenState()) assertThat(underTest.getPickerScreenState())
@@ -194,20 +182,16 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() {
private fun setUpState( private fun setUpState(
isWalletEnabled: Boolean = true, isWalletEnabled: Boolean = true,
isWalletServiceAvailable: Boolean = true,
isWalletQuerySuccessful: Boolean = true, isWalletQuerySuccessful: Boolean = true,
hasWalletIcon: Boolean = true,
hasSelectedCard: Boolean = true, hasSelectedCard: Boolean = true,
) { ) {
whenever(walletController.isWalletEnabled).thenReturn(isWalletEnabled) whenever(walletController.isWalletEnabled).thenReturn(isWalletEnabled)
val walletClient: QuickAccessWalletClient = mock() val walletClient: QuickAccessWalletClient = mock()
val icon: Drawable? = whenever(walletClient.tileIcon).thenReturn(ICON)
if (hasWalletIcon) { whenever(walletClient.isWalletServiceAvailable).thenReturn(isWalletServiceAvailable)
ICON
} else {
null
}
whenever(walletClient.tileIcon).thenReturn(icon)
whenever(walletController.walletClient).thenReturn(walletClient) whenever(walletController.walletClient).thenReturn(walletClient)
whenever(walletController.queryWalletCards(any())).thenAnswer { invocation -> whenever(walletController.queryWalletCards(any())).thenAnswer { invocation ->