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

Commit 95fd78a0 authored by Beverly's avatar Beverly
Browse files

Add UDFPS transition support for DOZING 

The device entry icon should follow AOD logic
when DOZING, because if the device pulses (from
an incoming notification or from the quick pickup gesture),
we show the AOD UI while the device is dozing. Therefore,
we need to put the device entry icon in the AOD-UI state
when dozing.

Test: atest AlternateBouncerToAodTransitionViewModelTest AlternateBouncerToDozingTransitionViewModelTest DozingToGoneTransitionViewModelTest DozingToLockscreenTransitionViewModelTest DozingToPrimaryBouncerTransitionViewModelTest GoneToDozingTransitionViewModelTest LockscreenToDozingTransitionViewModelTest PrimaryBouncerToDozingTransitionViewModelTest
Test: manually test transitions to and from DOZING
Fixes: 314911640
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT

Change-Id: I57c0baf88f84adb72e930ebaa24790496cc67be5
parent dc5a7c2b

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

+31 −4
Original line number Diff line number Diff line
@@ -19,15 +19,15 @@ package com.android.systemui.keyguard.ui.viewmodel 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository

import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository

import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository

import com.android.systemui.biometrics.shared.model.FingerprintSensorType

import com.android.systemui.biometrics.shared.model.SensorStrength

import com.android.systemui.coroutines.collectValues

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

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

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

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

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

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

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

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

import com.android.systemui.keyguard.shared.model.TransitionState
@@ -63,7 +63,7 @@ class AlternateBouncerToAodTransitionViewModelTest : SysuiTestCase() { 
    }



    @Test

    fun deviceEntryParentViewAppear() =

    fun deviceEntryParentViewAppear_udfpsEnrolledAndEnabled() =

        testScope.runTest {

            fingerprintPropertyRepository.setProperties(

                sensorId = 0,
@@ -89,6 +89,33 @@ class AlternateBouncerToAodTransitionViewModelTest : SysuiTestCase() { 
            values.forEach { assertThat(it).isEqualTo(1f) }

        }



    @Test

    fun deviceEntryParentViewDisappear_udfpsNotEnrolledAndEnabled() =

        testScope.runTest {

            fingerprintPropertyRepository.setProperties(

                sensorId = 0,

                strength = SensorStrength.STRONG,

                sensorType = FingerprintSensorType.UDFPS_OPTICAL,

                sensorLocations = emptyMap(),

            )

            biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false)

            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(0f) }

        }



    @Test

    fun deviceEntryBackgroundViewDisappear() =

        testScope.runTest {

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

0 → 100644
+134 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository

import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository

import com.android.systemui.coroutines.collectValues

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

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

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

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

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

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

import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class AlternateBouncerToDozingTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository

    private lateinit var fingerprintPropertyRepository: FakeFingerprintPropertyRepository

    private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository

    private lateinit var underTest: AlternateBouncerToDozingTransitionViewModel



    @Before

    fun setUp() {

        keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

        fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository

        biometricSettingsRepository = kosmos.biometricSettingsRepository

        underTest = kosmos.alternateBouncerToDozingTransitionViewModel

    }



    @Test

    fun deviceEntryParentViewAppear_udfpsEnrolledAndEnabled() =

        testScope.runTest {

            fingerprintPropertyRepository.supportsUdfps()

            biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true)

            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(1f) }

        }



    @Test

    fun deviceEntryParentViewDisappear_udfpsNotEnrolledAndEnabled() =

        testScope.runTest {

            fingerprintPropertyRepository.supportsUdfps()

            biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false)

            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(0f) }

        }



    @Test

    fun deviceEntryBackgroundViewDisappear() =

        testScope.runTest {

            val values by collectValues(underTest.deviceEntryBackgroundViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(0f) }

        }



    private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {

        return TransitionStep(

            from = KeyguardState.ALTERNATE_BOUNCER,

            to = KeyguardState.DOZING,

            value = value,

            transitionState = state,

            ownerName = "AlternateBouncerToDozingTransitionViewModelTest"

        )

    }

}

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

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectValues

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

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

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

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

import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class DozingToGoneTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository

    private lateinit var underTest: DozingToGoneTransitionViewModel



    @Before

    fun setUp() {

        keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

        underTest = kosmos.dozingToGoneTransitionViewModel

    }



    @Test

    fun deviceEntryParentViewDisappear() =

        testScope.runTest {

            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(0f) }

        }



    private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {

        return TransitionStep(

            from = KeyguardState.DOZING,

            to = KeyguardState.GONE,

            value = value,

            transitionState = state,

            ownerName = "DozingToGoneTransitionViewModelTest"

        )

    }

}

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

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectValues

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

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

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

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

import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class DozingToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository

    private lateinit var underTest: DozingToPrimaryBouncerTransitionViewModel



    @Before

    fun setUp() {

        keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

        underTest = kosmos.dozingToPrimaryBouncerTransitionViewModel

    }



    @Test

    fun deviceEntryParentViewDisappear() =

        testScope.runTest {

            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(0f) }

        }



    private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {

        return TransitionStep(

            from = KeyguardState.DOZING,

            to = KeyguardState.PRIMARY_BOUNCER,

            value = value,

            transitionState = state,

            ownerName = "DozingToPrimaryBouncerTransitionViewModelTest"

        )

    }

}

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

0 → 100644
+116 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository

import com.android.systemui.biometrics.data.repository.fakeFingerprintPropertyRepository

import com.android.systemui.coroutines.collectValues

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

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

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

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

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

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

import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class GoneToDozingTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private lateinit var fingerprintPropertyRepository: FakeFingerprintPropertyRepository

    private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository

    private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository

    private lateinit var underTest: GoneToDozingTransitionViewModel



    @Before

    fun setUp() {

        fingerprintPropertyRepository = kosmos.fakeFingerprintPropertyRepository

        biometricSettingsRepository = kosmos.fakeBiometricSettingsRepository

        keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

        underTest = kosmos.goneToDozingTransitionViewModel

    }



    @Test

    fun deviceEntryParentViewAppear_udfpsEnrolledAndEnabled() =

        testScope.runTest {

            fingerprintPropertyRepository.supportsUdfps()

            biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true)



            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(1f) }

        }



    @Test

    fun deviceEntryParentViewDisappear_noUdfpsEnrolled_noUpdates() =

        testScope.runTest {

            fingerprintPropertyRepository.supportsUdfps()

            biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false)



            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isNull() }

        }



    private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {

        return TransitionStep(

            from = KeyguardState.GONE,

            to = KeyguardState.DOZING,

            value = value,

            transitionState = state,

            ownerName = "GoneToDozingTransitionViewModelTest"

        )

    }

}