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

Commit 3ca32839 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "QuickAccessWalletQuickAffordance Config shouldn't check older setting."... 

Merge "QuickAccessWalletQuickAffordance Config shouldn't check older setting." into udc-dev am: f89c4b42 am: e049ad21

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



Change-Id: I81eb84d35cf77ce133fa847eacf1f03fadaf544f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8c3ec05 e049ad21

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

+7 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ constructor( 
                        val hasCards = response?.walletCards?.isNotEmpty() == true

                        trySendWithFailureLogging(

                            state(

                                isFeatureEnabled = walletController.isWalletEnabled,

                                isFeatureEnabled = isWalletAvailable(),

                                hasCard = hasCards,

                                tileIcon = walletController.walletClient.tileIcon,

                            ),
@@ -100,7 +100,7 @@ constructor( 
        return when {

            !walletController.walletClient.isWalletServiceAvailable ->

                KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice

            !walletController.isWalletEnabled || queryCards().isEmpty() -> {

            !isWalletAvailable() || queryCards().isEmpty() -> {

                KeyguardQuickAffordanceConfig.PickerScreenState.Disabled(

                    instructions =

                        listOf(
@@ -146,6 +146,11 @@ constructor( 
        }

    }



    private fun isWalletAvailable() =

        with(walletController.walletClient) {

            isWalletServiceAvailable && isWalletFeatureAvailable

        }



    private fun state(

        isFeatureEnabled: Boolean,

        hasCard: Boolean,

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

+5 −6
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { 
    }



    @Test

    fun affordance_walletNotEnabled_modelIsNone() = runBlockingTest {

        setUpState(isWalletEnabled = false)

    fun affordance_walletFeatureNotEnabled_modelIsNone() = runBlockingTest {

        setUpState(isWalletFeatureAvailable = false)

        var latest: KeyguardQuickAffordanceConfig.LockScreenState? = null



        val job = underTest.lockScreenState.onEach { latest = it }.launchIn(this)
@@ -165,7 +165,7 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { 
    @Test

    fun getPickerScreenState_disabledWhenTheFeatureIsNotEnabled() = runTest {

        setUpState(

            isWalletEnabled = false,

            isWalletFeatureAvailable = false,

        )



        assertThat(underTest.getPickerScreenState())
@@ -183,16 +183,15 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { 
    }



    private fun setUpState(

        isWalletEnabled: Boolean = true,

        isWalletFeatureAvailable: Boolean = true,

        isWalletServiceAvailable: Boolean = true,

        isWalletQuerySuccessful: Boolean = true,

        hasSelectedCard: Boolean = true,

    ) {

        whenever(walletController.isWalletEnabled).thenReturn(isWalletEnabled)



        val walletClient: QuickAccessWalletClient = mock()

        whenever(walletClient.tileIcon).thenReturn(ICON)

        whenever(walletClient.isWalletServiceAvailable).thenReturn(isWalletServiceAvailable)

        whenever(walletClient.isWalletFeatureAvailable).thenReturn(isWalletFeatureAvailable)



        whenever(walletController.walletClient).thenReturn(walletClient)