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

Commit fd9ac7f4 authored by Beverly's avatar Beverly
Browse files

Never use DeviceEntryInteractor unless behind the flexiglass flag 

Test: manual
Fixes: 323212430
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT
Change-Id: I8c50b8aa63db8d66c6388bce57bd9966eebcf760
parent 39fe4697

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ constructor( 
    val iconType: Flow<DeviceEntryIconView.IconType> =

        combine(

            deviceEntryUdfpsInteractor.isListeningForUdfps,

            deviceEntryInteractor.isUnlocked,

            keyguardInteractor.isKeyguardDismissible,

        ) { isListeningForUdfps, isUnlocked ->

            if (isUnlocked) {

                DeviceEntryIconView.IconType.UNLOCK

packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/ui/viewmodel/UdfpsAccessibilityOverlayViewModelTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.deviceentry.data.ui.viewmodel.deviceEntryUdfpsAccess 
import com.android.systemui.flags.Flags.FULL_SCREEN_USER_SWITCHER

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.keyguard.data.repository.deviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.TransitionState
@@ -51,6 +52,7 @@ class UdfpsAccessibilityOverlayViewModelTest : SysuiTestCase() { 
        }

    private val deviceEntryIconTransition = kosmos.fakeDeviceEntryIconViewModelTransition

    private val testScope = kosmos.testScope

    private val keyguardRepository = kosmos.fakeKeyguardRepository

    private val accessibilityRepository = kosmos.fakeAccessibilityRepository

    private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

    private val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository
@@ -103,11 +105,11 @@ class UdfpsAccessibilityOverlayViewModelTest : SysuiTestCase() { 
        }



    @Test

    fun deviceUnlocked_overlayNotVisible() =

    fun keyguardDismissible_overlayNotVisible() =

        testScope.runTest {

            val visible by collectLastValue(underTest.visible)

            setupVisibleStateOnLockscreen()

            deviceEntryRepository.setUnlocked(true)

            keyguardRepository.setKeyguardDismissible(true)

            assertThat(visible).isFalse()

        }