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

Commit c90e9b00 authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge "Hide lockscreen whenever we transition from dozing/aod -> primary bouncer" into main

parents 8757d482 5d62373b

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

+34 −9
Original line number Diff line number Diff line
@@ -15,16 +15,25 @@ 
 */

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



import android.platform.test.annotations.EnableFlags

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

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectValues

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

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.keyguard.ui.transitions.blurConfig

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
@@ -46,17 +55,33 @@ class AodToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() { 
                transitionProgress = listOf(0.0f, 0.0f, 0.3f, 0.4f, 0.5f, 1.0f),

                startValue = kosmos.blurConfig.maxBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                transitionFactory = { value, state ->

                transitionFactory = ::step,

                actualValuesProvider = { values },

                checkInterpolatedValues = false,

            )

        }



    @Test

    @EnableFlags(Flags.FLAG_BOUNCER_UI_REVAMP)

    fun aodToPrimaryBouncerHidesLockscreen() =

        testScope.runTest {

            val lockscreenAlpha by collectValues(underTest.lockscreenAlpha)

            val notificationAlpha by collectValues(underTest.notificationAlpha)



            val transitionSteps = listOf(step(0.0f, STARTED), step(0.5f), step(1.0f, FINISHED))

            kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps(transitionSteps, testScope)

            runCurrent()



            lockscreenAlpha.forEach { assertThat(it).isEqualTo(0.0f) }

            notificationAlpha.forEach { assertThat(it).isEqualTo(0.0f) }

        }



    private fun step(value: Float, transitionState: TransitionState = RUNNING) =

        TransitionStep(

            from = KeyguardState.AOD,

            to = KeyguardState.PRIMARY_BOUNCER,

            value = value,

                        transitionState = state,

            transitionState = transitionState,

            ownerName = "AodToPrimaryBouncerTransitionViewModelTest",

        )

                },

                actualValuesProvider = { values },

                checkInterpolatedValues = false,

            )

        }

}

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

+20 −0
Original line number Diff line number Diff line
@@ -16,21 +16,26 @@ 


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



import android.platform.test.annotations.EnableFlags

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

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

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

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.keyguard.ui.transitions.blurConfig

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

import org.junit.Test
@@ -85,6 +90,21 @@ class DozingToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() { 
            )

        }



    @Test

    @EnableFlags(Flags.FLAG_BOUNCER_UI_REVAMP)

    fun dozingToPrimaryBouncerHidesLockscreen() =

        testScope.runTest {

            val lockscreenAlpha by collectValues(underTest.lockscreenAlpha)

            val notificationAlpha by collectValues(underTest.notificationAlpha)



            val transitionSteps = listOf(step(0.0f, STARTED), step(0.5f), step(1.0f, FINISHED))

            kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps(transitionSteps, testScope)

            runCurrent()



            lockscreenAlpha.forEach { assertThat(it).isEqualTo(0.0f) }

            notificationAlpha.forEach { assertThat(it).isEqualTo(0.0f) }

        }



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

        return TransitionStep(

            from = KeyguardState.DOZING,

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

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


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



import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.keyguard.shared.model.Edge
@@ -29,6 +30,7 @@ import com.android.systemui.scene.shared.model.Scenes 
import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.emptyFlow



/**

 * Breaks down AOD->PRIMARY BOUNCER transition into discrete steps for corresponding views to
@@ -54,6 +56,12 @@ constructor(blurConfig: BlurConfig, animationFlow: KeyguardTransitionAnimationFl 
    override val windowBlurRadius: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)



    val lockscreenAlpha: Flow<Float> =

        if (Flags.bouncerUiRevamp()) transitionAnimation.immediatelyTransitionTo(0.0f)

        else emptyFlow()



    val notificationAlpha = lockscreenAlpha



    override val notificationBlurRadius: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(0.0f)

}

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

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


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



import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.domain.interactor.FromDozingTransitionInteractor.Companion.TO_PRIMARY_BOUNCER_DURATION

import com.android.systemui.keyguard.shared.model.Edge
@@ -29,6 +30,7 @@ import com.android.systemui.scene.shared.model.Scenes 
import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.emptyFlow



/**

 * Breaks down DOZING->PRIMARY BOUNCER transition into discrete steps for corresponding views to
@@ -64,6 +66,13 @@ constructor(private val blurConfig: BlurConfig, animationFlow: KeyguardTransitio 
            },

            onFinish = { blurConfig.maxBlurRadiusPx },

        )



    val lockscreenAlpha: Flow<Float> =

        if (Flags.bouncerUiRevamp()) transitionAnimation.immediatelyTransitionTo(0.0f)

        else emptyFlow()



    val notificationAlpha: Flow<Float> = lockscreenAlpha



    override val notificationBlurRadius: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(0f)

}

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

+5 −0
Original line number Diff line number Diff line
@@ -96,9 +96,12 @@ constructor( 
    private val aodToGoneTransitionViewModel: AodToGoneTransitionViewModel,

    private val aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel,

    private val aodToOccludedTransitionViewModel: AodToOccludedTransitionViewModel,

    private val aodToPrimaryBouncerTransitionViewModel: AodToPrimaryBouncerTransitionViewModel,

    private val dozingToGoneTransitionViewModel: DozingToGoneTransitionViewModel,

    private val dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel,

    private val dozingToOccludedTransitionViewModel: DozingToOccludedTransitionViewModel,

    private val dozingToPrimaryBouncerTransitionViewModel:

        DozingToPrimaryBouncerTransitionViewModel,

    private val dreamingToAodTransitionViewModel: DreamingToAodTransitionViewModel,

    private val dreamingToGoneTransitionViewModel: DreamingToGoneTransitionViewModel,

    private val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,
@@ -243,9 +246,11 @@ constructor( 
                        aodToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        aodToLockscreenTransitionViewModel.lockscreenAlpha(viewState),

                        aodToOccludedTransitionViewModel.lockscreenAlpha(viewState),

                        aodToPrimaryBouncerTransitionViewModel.lockscreenAlpha,

                        dozingToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        dozingToLockscreenTransitionViewModel.lockscreenAlpha,

                        dozingToOccludedTransitionViewModel.lockscreenAlpha(viewState),

                        dozingToPrimaryBouncerTransitionViewModel.lockscreenAlpha,

                        dreamingToAodTransitionViewModel.lockscreenAlpha,

                        dreamingToGoneTransitionViewModel.lockscreenAlpha,

                        dreamingToLockscreenTransitionViewModel.lockscreenAlpha,