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

Commit 331bbabf authored by Chandru S's avatar Chandru S
Browse files

Fixes the issue of UDFPS icon background being white when the device is in DOZE_PULSING state 

Test: manually
 1. Disable dark theme and AOD
 2. Enroll fingerprint on a udfps device
 3. Go to lockscreen, keep the phone on a table.
 4. Press power button to force Lockscreen -> Dozing transition
 5. move the phone around on the table to switch from dozing to doze_pulsing
 6. Fingerprint icon background should not be visible now (black)

Fixes: 366100470
Flag: EXEMPT bugfix
Change-Id: I6e962ff0b3bd1184e453b5b1ea247e5efb6f4cec
parent f5429b94

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

0 → 100644
+90 −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.fingerprintPropertyRepository

import com.android.systemui.coroutines.collectLastValue

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.TransitionState.STARTED

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.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class DeviceEntryBackgroundViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val underTest: DeviceEntryBackgroundViewModel by lazy {

        kosmos.deviceEntryBackgroundViewModel

    }



    @Test

    fun lockscreenToDozingTransitionChangesBackgroundViewAlphaToZero() =

        testScope.runTest {

            kosmos.fingerprintPropertyRepository.supportsUdfps()

            val alpha by collectLastValue(underTest.alpha)



            kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps(

                listOf(dozingToLockscreen(0f, STARTED), dozingToLockscreen(0.1f)),

                testScope,

            )

            runCurrent()

            assertThat(alpha).isEqualTo(1.0f)



            kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps(

                listOf(lockscreenToDozing(0f, STARTED)),

                testScope,

            )

            runCurrent()



            assertThat(alpha).isEqualTo(0.0f)

        }



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

        return TransitionStep(

            from = KeyguardState.LOCKSCREEN,

            to = KeyguardState.DOZING,

            value = value,

            transitionState = state,

            ownerName = "DeviceEntryBackgroundViewModelTest",

        )

    }



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

        return TransitionStep(

            from = KeyguardState.DOZING,

            to = KeyguardState.LOCKSCREEN,

            value = value,

            transitionState = state,

            ownerName = "DeviceEntryBackgroundViewModelTest",

        )

    }

}

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

+4 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ constructor( 
    primaryBouncerToAodTransitionViewModel: PrimaryBouncerToAodTransitionViewModel,

    primaryBouncerToDozingTransitionViewModel: PrimaryBouncerToDozingTransitionViewModel,

    primaryBouncerToLockscreenTransitionViewModel: PrimaryBouncerToLockscreenTransitionViewModel,

    lockscreenToDozingTransitionViewModel: LockscreenToDozingTransitionViewModel,

) {

    val color: Flow<Int> =

        deviceEntryIconViewModel.useBackgroundProtection.flatMapLatest { useBackground ->
@@ -103,7 +104,9 @@ constructor( 
                        offToLockscreenTransitionViewModel.deviceEntryBackgroundViewAlpha,

                        primaryBouncerToAodTransitionViewModel.deviceEntryBackgroundViewAlpha,

                        primaryBouncerToDozingTransitionViewModel.deviceEntryBackgroundViewAlpha,

                        primaryBouncerToLockscreenTransitionViewModel.deviceEntryBackgroundViewAlpha,

                        primaryBouncerToLockscreenTransitionViewModel

                            .deviceEntryBackgroundViewAlpha,

                        lockscreenToDozingTransitionViewModel.deviceEntryBackgroundViewAlpha,

                    )

                    .merge()

                    .onStart {

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

+4 −4
Original line number Diff line number Diff line
@@ -55,16 +55,16 @@ constructor( 
            onCancel = { 1f },

        )



    val deviceEntryBackgroundViewAlpha: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(0f)



    override val deviceEntryParentViewAlpha: Flow<Float> =

        deviceEntryUdfpsInteractor.isUdfpsEnrolledAndEnabled.flatMapLatest {

            isUdfpsEnrolledAndEnabled ->

            if (isUdfpsEnrolledAndEnabled) {

                transitionAnimation.immediatelyTransitionTo(1f)

            } else {

                transitionAnimation.sharedFlow(

                    duration = 250.milliseconds,

                    onStep = { 1f - it },

                )

                transitionAnimation.sharedFlow(duration = 250.milliseconds, onStep = { 1f - it })

            }

        }

}

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModelKosmos.kt

0 → 100644
+53 −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 android.content.applicationContext

import com.android.systemui.common.ui.domain.interactor.configurationInteractor

import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture

import kotlinx.coroutines.ExperimentalCoroutinesApi



@ExperimentalCoroutinesApi

val Kosmos.deviceEntryBackgroundViewModel by Fixture {

    DeviceEntryBackgroundViewModel(

        context = applicationContext,

        deviceEntryIconViewModel = deviceEntryIconViewModel,

        configurationInteractor = configurationInteractor,

        keyguardTransitionInteractor = keyguardTransitionInteractor,

        alternateBouncerToAodTransitionViewModel = alternateBouncerToAodTransitionViewModel,

        alternateBouncerToDozingTransitionViewModel = alternateBouncerToDozingTransitionViewModel,

        aodToLockscreenTransitionViewModel = aodToLockscreenTransitionViewModel,

        dozingToLockscreenTransitionViewModel = dozingToLockscreenTransitionViewModel,

        dreamingToAodTransitionViewModel = dreamingToAodTransitionViewModel,

        dreamingToLockscreenTransitionViewModel = dreamingToLockscreenTransitionViewModel,

        goneToAodTransitionViewModel = goneToAodTransitionViewModel,

        goneToDozingTransitionViewModel = goneToDozingTransitionViewModel,

        goneToLockscreenTransitionViewModel = goneToLockscreenTransitionViewModel,

        lockscreenToAodTransitionViewModel = lockscreenToAodTransitionViewModel,

        occludedToAodTransitionViewModel = occludedToAodTransitionViewModel,

        occludedToDozingTransitionViewModel = occludedToDozingTransitionViewModel,

        occludedToLockscreenTransitionViewModel = occludedToLockscreenTransitionViewModel,

        offToLockscreenTransitionViewModel = offToLockscreenTransitionViewModel,

        primaryBouncerToAodTransitionViewModel = primaryBouncerToAodTransitionViewModel,

        primaryBouncerToDozingTransitionViewModel = primaryBouncerToDozingTransitionViewModel,

        primaryBouncerToLockscreenTransitionViewModel =

            primaryBouncerToLockscreenTransitionViewModel,

        lockscreenToDozingTransitionViewModel = lockscreenToDozingTransitionViewModel,

    )

}