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

Commit a5416d22 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Ensure AOD ui reappears after ALTERNATE_BOUNCER" into main

parents 40e7272d 2a8ebcc5

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

+19 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRe 
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.collectLastValue

import com.android.systemui.coroutines.collectValues

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

import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
@@ -116,6 +117,24 @@ class AlternateBouncerToAodTransitionViewModelTest : SysuiTestCase() { 
            values.forEach { assertThat(it).isEqualTo(0f) }

        }



    @Test

    fun lockscreenAlphaStartsFromViewStateAccessorAlpha() =

        testScope.runTest {

            val viewState = ViewStateAccessor(alpha = { 0.5f })

            val alpha by collectLastValue(underTest.lockscreenAlpha(viewState))



            keyguardTransitionRepository.sendTransitionStep(step(0f, TransitionState.STARTED))



            keyguardTransitionRepository.sendTransitionStep(step(0f))

            assertThat(alpha).isEqualTo(0.5f)



            keyguardTransitionRepository.sendTransitionStep(step(0.5f))

            assertThat(alpha).isEqualTo(0.75f)



            keyguardTransitionRepository.sendTransitionStep(step(1f))

            assertThat(alpha).isEqualTo(1f)

        }



    @Test

    fun deviceEntryBackgroundViewDisappear() =

        testScope.runTest {

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

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


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



import android.util.MathUtils

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor

import com.android.systemui.keyguard.domain.interactor.FromAlternateBouncerTransitionInteractor
@@ -47,6 +48,15 @@ constructor( 
            edge = Edge.create(from = ALTERNATE_BOUNCER, to = AOD),

        )



    fun lockscreenAlpha(viewState: ViewStateAccessor): Flow<Float> {

        var startAlpha = 1f

        return transitionAnimation.sharedFlow(

            duration = FromAlternateBouncerTransitionInteractor.TO_AOD_DURATION,

            onStart = { startAlpha = viewState.alpha() },

            onStep = { MathUtils.lerp(startAlpha, 1f, it) },

        )

    }



    val deviceEntryBackgroundViewAlpha: Flow<Float> =

        transitionAnimation.sharedFlow(

            duration = FromAlternateBouncerTransitionInteractor.TO_AOD_DURATION,

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

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ constructor( 
    private val communalInteractor: CommunalInteractor,

    private val keyguardTransitionInteractor: KeyguardTransitionInteractor,

    private val notificationsKeyguardInteractor: NotificationsKeyguardInteractor,

    private val alternateBouncerToAodTransitionViewModel: AlternateBouncerToAodTransitionViewModel,

    private val alternateBouncerToGoneTransitionViewModel:

        AlternateBouncerToGoneTransitionViewModel,

    private val alternateBouncerToLockscreenTransitionViewModel:
@@ -239,6 +240,7 @@ constructor( 
                merge(

                        alphaOnShadeExpansion,

                        keyguardInteractor.dismissAlpha,

                        alternateBouncerToAodTransitionViewModel.lockscreenAlpha(viewState),

                        alternateBouncerToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        alternateBouncerToLockscreenTransitionViewModel.lockscreenAlpha(viewState),

                        aodToGoneTransitionViewModel.lockscreenAlpha(viewState),

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

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ val Kosmos.keyguardRootViewModel by Fixture { 
        communalInteractor = communalInteractor,

        keyguardTransitionInteractor = keyguardTransitionInteractor,

        notificationsKeyguardInteractor = notificationsKeyguardInteractor,

        alternateBouncerToAodTransitionViewModel = alternateBouncerToAodTransitionViewModel,

        alternateBouncerToGoneTransitionViewModel = alternateBouncerToGoneTransitionViewModel,

        alternateBouncerToLockscreenTransitionViewModel =

            alternateBouncerToLockscreenTransitionViewModel,