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

Commit 1b679fb5 authored by Jiayin Liu's avatar Jiayin Liu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-25515462-YLMDXMTZPP" into main 

* changes:
  Revert "Migrate OCCLUDED<->LOCKSCREEN alpha/translation"
  Revert "Use shared flow for transition animations"
parents caa82d92 fa5c9e5e

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.SysuiTestCase

import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository

import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository

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

import com.android.systemui.coroutines.collectLastValue

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

import com.android.systemui.keyguard.shared.model.CameraLaunchSourceModel
@@ -54,6 +53,7 @@ class KeyguardInteractorTest : SysuiTestCase() { 
    private val sceneInteractor = testUtils.sceneInteractor()

    private val commandQueue = FakeCommandQueue()

    private val bouncerRepository = FakeKeyguardBouncerRepository()

    private val configurationRepository = FakeConfigurationRepository()

    private val shadeRepository = FakeShadeRepository()

    private val transitionState: MutableStateFlow<ObservableTransitionState> =

        MutableStateFlow(ObservableTransitionState.Idle(SceneKey.Gone))
@@ -65,7 +65,7 @@ class KeyguardInteractorTest : SysuiTestCase() { 
            powerInteractor = PowerInteractorFactory.create().powerInteractor,

            sceneContainerFlags = testUtils.sceneContainerFlags,

            bouncerRepository = bouncerRepository,

            configurationInteractor = ConfigurationInteractor(FakeConfigurationRepository()),

            configurationRepository = configurationRepository,

            shadeRepository = shadeRepository,

            sceneInteractorProvider = { sceneInteractor },

        )

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

+159 −130
Original line number Diff line number Diff line
@@ -19,11 +19,14 @@ 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.shared.model.FingerprintSensorType

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

import com.android.systemui.coroutines.collectValues

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

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

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

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

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

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

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING
@@ -35,12 +38,16 @@ 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.kosmos.testScope

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.mock

import com.google.common.collect.Range

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.launchIn

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.UnconfinedTestDispatcher

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith
@@ -48,201 +55,223 @@ import org.junit.runner.RunWith 
@SmallTest

@RunWith(AndroidJUnit4::class)

class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

    private val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository

    private val underTest = kosmos.dreamingToLockscreenTransitionViewModel

    private lateinit var underTest: DreamingToLockscreenTransitionViewModel

    private lateinit var repository: FakeKeyguardTransitionRepository

    private lateinit var fingerprintPropertyRepository: FakeFingerprintPropertyRepository



    @Before

    fun setUp() {

        repository = FakeKeyguardTransitionRepository()

        fingerprintPropertyRepository = FakeFingerprintPropertyRepository()

        val interactor =

            KeyguardTransitionInteractorFactory.create(

                    scope = TestScope().backgroundScope,

                    repository = repository,

                )

                .keyguardTransitionInteractor

        underTest =

            DreamingToLockscreenTransitionViewModel(

                interactor,

                mock(),

                DeviceEntryUdfpsInteractor(

                    fingerprintPropertyRepository = fingerprintPropertyRepository,

                    fingerprintAuthRepository = FakeDeviceEntryFingerprintAuthRepository(),

                    biometricSettingsRepository = FakeBiometricSettingsRepository(),

                ),

            )

    }



    @Test

    fun dreamOverlayTranslationY() =

        testScope.runTest {

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val pixels = 100

            val values by collectValues(underTest.dreamOverlayTranslationY(pixels))



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.3f),

                    step(0.5f),

                    step(0.6f),

                    step(0.8f),

                    step(1f),

                ),

                testScope,

            )

            val job =

                underTest.dreamOverlayTranslationY(pixels).onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionStep(step(0f, STARTED))

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.3f))

            repository.sendTransitionStep(step(0.5f))

            repository.sendTransitionStep(step(0.6f))

            repository.sendTransitionStep(step(0.8f))

            repository.sendTransitionStep(step(1f))



            assertThat(values.size).isEqualTo(7)

            values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) }



            job.cancel()

        }



    @Test

    fun dreamOverlayFadeOut() =

        testScope.runTest {

            val values by collectValues(underTest.dreamOverlayAlpha)

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val job = underTest.dreamOverlayAlpha.onEach { values.add(it) }.launchIn(this)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

            // Should start running here...

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.5f),

            repository.sendTransitionStep(step(0f, STARTED))

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.1f))

            repository.sendTransitionStep(step(0.5f))

            // ...up to here

                    step(1f),

                ),

                testScope,

            )

            repository.sendTransitionStep(step(1f))



            // Only two values should be present, since the dream overlay runs for a small fraction

            // of the overall animation time

            assertThat(values.size).isEqualTo(4)

            values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) }



            job.cancel()

        }



    @Test

    fun lockscreenFadeIn() =

        testScope.runTest {

            val values by collectValues(underTest.lockscreenAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val job = underTest.lockscreenAlpha.onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionStep(step(0f, STARTED))

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.1f))

            repository.sendTransitionStep(step(0.2f))

            repository.sendTransitionStep(step(0.3f))

            repository.sendTransitionStep(step(1f))



            assertThat(values.size).isEqualTo(4)

            values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) }



            job.cancel()

        }



    @Test

    fun deviceEntryParentViewFadeIn() =

        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,

            )

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val job = underTest.deviceEntryParentViewAlpha.onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionStep(step(0f, STARTED))

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.1f))

            repository.sendTransitionStep(step(0.2f))

            repository.sendTransitionStep(step(0.3f))

            repository.sendTransitionStep(step(1f))



            assertThat(values.size).isEqualTo(4)

            values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) }



            job.cancel()

        }



    @Test

    fun deviceEntryBackgroundViewAppear() =

        testScope.runTest {

        runTest(UnconfinedTestDispatcher()) {

            fingerprintPropertyRepository.setProperties(

                sensorId = 0,

                strength = SensorStrength.STRONG,

                sensorType = FingerprintSensorType.UDFPS_OPTICAL,

                sensorLocations = emptyMap(),

            )

            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,

            )

            val values = mutableListOf<Float>()



            val job =

                underTest.deviceEntryBackgroundViewAlpha.onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionStep(step(0f, STARTED))

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.1f))

            repository.sendTransitionStep(step(0.2f))

            repository.sendTransitionStep(step(0.3f))

            repository.sendTransitionStep(step(1f))



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



            job.cancel()

        }



    @Test

    fun deviceEntryBackground_noUdfps_noUpdates() =

        testScope.runTest {

        runTest(UnconfinedTestDispatcher()) {

            fingerprintPropertyRepository.setProperties(

                sensorId = 0,

                strength = SensorStrength.STRONG,

                sensorType = FingerprintSensorType.REAR,

                sensorLocations = emptyMap(),

            )

            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,

            )

            val values = mutableListOf<Float>()



            val job =

                underTest.deviceEntryBackgroundViewAlpha.onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionStep(step(0f, STARTED))

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.1f))

            repository.sendTransitionStep(step(0.2f))

            repository.sendTransitionStep(step(0.3f))

            repository.sendTransitionStep(step(1f))



            assertThat(values.size).isEqualTo(0) // no updates



            job.cancel()

        }



    @Test

    fun lockscreenTranslationY() =

        testScope.runTest {

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val pixels = 100

            val values by collectValues(underTest.lockscreenTranslationY(pixels))



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.3f),

                    step(0.5f),

                    step(1f),

                ),

                testScope,

            )

            val job =

                underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionStep(step(0f, STARTED))

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.3f))

            repository.sendTransitionStep(step(0.5f))

            repository.sendTransitionStep(step(1f))



            assertThat(values.size).isEqualTo(5)

            values.forEach { assertThat(it).isIn(Range.closed(-100f, 0f)) }



            job.cancel()

        }



    @Test

    fun transitionEnded() =

        testScope.runTest {

            val values by collectValues(underTest.transitionEnded)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    TransitionStep(DOZING, DREAMING, 0.0f, STARTED),

                    TransitionStep(DOZING, DREAMING, 1.0f, FINISHED),

                    TransitionStep(DREAMING, LOCKSCREEN, 0.0f, STARTED),

                    TransitionStep(DREAMING, LOCKSCREEN, 0.1f, RUNNING),

                    TransitionStep(DREAMING, LOCKSCREEN, 1.0f, FINISHED),

                    TransitionStep(LOCKSCREEN, DREAMING, 0.0f, STARTED),

                    TransitionStep(LOCKSCREEN, DREAMING, 0.5f, RUNNING),

                    TransitionStep(LOCKSCREEN, DREAMING, 1.0f, FINISHED),

                    TransitionStep(DREAMING, GONE, 0.0f, STARTED),

                    TransitionStep(DREAMING, GONE, 0.5f, RUNNING),

                    TransitionStep(DREAMING, GONE, 1.0f, CANCELED),

                    TransitionStep(DREAMING, AOD, 0.0f, STARTED),

                    TransitionStep(DREAMING, AOD, 1.0f, FINISHED),

                ),

                testScope,

            )

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<TransitionStep>()



            val job = underTest.transitionEnded.onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionStep(TransitionStep(DOZING, DREAMING, 0.0f, STARTED))

            repository.sendTransitionStep(TransitionStep(DOZING, DREAMING, 1.0f, FINISHED))



            repository.sendTransitionStep(TransitionStep(DREAMING, LOCKSCREEN, 0.0f, STARTED))

            repository.sendTransitionStep(TransitionStep(DREAMING, LOCKSCREEN, 0.1f, RUNNING))

            repository.sendTransitionStep(TransitionStep(DREAMING, LOCKSCREEN, 1.0f, FINISHED))



            repository.sendTransitionStep(TransitionStep(LOCKSCREEN, DREAMING, 0.0f, STARTED))

            repository.sendTransitionStep(TransitionStep(LOCKSCREEN, DREAMING, 0.5f, RUNNING))

            repository.sendTransitionStep(TransitionStep(LOCKSCREEN, DREAMING, 1.0f, FINISHED))



            repository.sendTransitionStep(TransitionStep(DREAMING, GONE, 0.0f, STARTED))

            repository.sendTransitionStep(TransitionStep(DREAMING, GONE, 0.5f, RUNNING))

            repository.sendTransitionStep(TransitionStep(DREAMING, GONE, 1.0f, CANCELED))



            repository.sendTransitionStep(TransitionStep(DREAMING, AOD, 0.0f, STARTED))

            repository.sendTransitionStep(TransitionStep(DREAMING, AOD, 1.0f, FINISHED))



            assertThat(values.size).isEqualTo(3)

            values.forEach {

                assertThat(it.transitionState == FINISHED || it.transitionState == CANCELED)

                    .isTrue()

            }



            job.cancel()

        }



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

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

+50 −38
Original line number Diff line number Diff line
@@ -19,73 +19,85 @@ 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.domain.interactor.KeyguardTransitionInteractorFactory

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.google.common.collect.Range

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

import kotlinx.coroutines.flow.launchIn

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.UnconfinedTestDispatcher

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

class GoneToDreamingTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val repository = kosmos.fakeKeyguardTransitionRepository

    private val underTest = kosmos.goneToDreamingTransitionViewModel

    private lateinit var underTest: GoneToDreamingTransitionViewModel

    private lateinit var repository: FakeKeyguardTransitionRepository



    @Before

    fun setUp() {

        repository = FakeKeyguardTransitionRepository()

        val interactor =

            KeyguardTransitionInteractorFactory.create(

                    scope = TestScope().backgroundScope,

                    repository = repository,

                )

                .keyguardTransitionInteractor

        underTest = GoneToDreamingTransitionViewModel(interactor)

    }



    @Test

    fun runTest() =

        testScope.runTest {

            val values by collectValues(underTest.lockscreenAlpha)

    fun lockscreenFadeOut() =

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val job = underTest.lockscreenAlpha.onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionSteps(

                listOf(

            // Should start running here...

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

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

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.1f))

            repository.sendTransitionStep(step(0.2f))

            repository.sendTransitionStep(step(0.3f))

            // ...up to here

                    step(1f),

                ),

                testScope,

            )

            repository.sendTransitionStep(step(1f))



            // Only three values should be present, since the dream overlay runs for a small

            // fraction of the overall animation time

            assertThat(values.size).isEqualTo(5)

            values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) }



            job.cancel()

        }



    @Test

    fun lockscreenTranslationY() =

        testScope.runTest {

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val pixels = 100

            val values by collectValues(underTest.lockscreenTranslationY(pixels))

            val job =

                underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this)



            repository.sendTransitionSteps(

                listOf(

            // Should start running here...

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.3f),

                    step(0.5f),

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

            repository.sendTransitionStep(step(0f))

            repository.sendTransitionStep(step(0.3f))

            repository.sendTransitionStep(step(0.5f))

            // And a final reset event on CANCEL

                    step(0.8f, TransitionState.CANCELED)

                ),

                testScope,

            )

            repository.sendTransitionStep(step(0.8f, TransitionState.CANCELED))



            assertThat(values.size).isEqualTo(5)

            values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) }



            job.cancel()

        }



    private fun step(

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

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.flags.Flags 
import com.android.systemui.flags.featureFlagsClassic

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

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

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

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

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

import com.android.systemui.keyguard.shared.model.TransitionState
@@ -54,7 +55,11 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { 
    private val repository = kosmos.fakeKeyguardTransitionRepository

    private val shadeRepository = kosmos.shadeRepository

    private val keyguardRepository = kosmos.fakeKeyguardRepository

    private val underTest = kosmos.lockscreenToDreamingTransitionViewModel

    private val underTest =

        LockscreenToDreamingTransitionViewModel(

            interactor = kosmos.keyguardTransitionInteractor,

            shadeDependentFlows = kosmos.shadeDependentFlows,

        )



    @Test

    fun lockscreenFadeOut() =

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

+11 −14

File changed.

Preview size limit exceeded, changes collapsed.