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

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

Merge "Add support for occluded<-> primary bouncer transitions for bouncer blur effects" into main

parents 1b59dcc6 571776c2

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

0 → 100644
+65 −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.flags.DisableSceneContainer

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

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 kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class OccludedToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val underTest by lazy { kosmos.occludedToPrimaryBouncerTransitionViewModel }



    @Test

    @DisableSceneContainer

    fun blurBecomesMaxValueImmediately() =

        testScope.runTest {

            val values by collectValues(underTest.windowBlurRadius)



            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0.0f, 0.2f, 0.3f, 0.65f, 0.7f, 1.0f),

                startValue = kosmos.blurConfig.maxBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                actualValuesProvider = { values },

                transitionFactory = { step, transitionState ->

                    TransitionStep(

                        from = KeyguardState.OCCLUDED,

                        to = KeyguardState.PRIMARY_BOUNCER,

                        value = step,

                        transitionState = transitionState,

                        ownerName = "OccludedToPrimaryBouncerTransitionViewModelTest",

                    )

                },

                checkInterpolatedValues = false,

            )

        }

}

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

0 → 100644
+65 −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.flags.DisableSceneContainer

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

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 kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class PrimaryBouncerToOccludedTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val underTest by lazy { kosmos.primaryBouncerToOccludedTransitionViewModel }



    @Test

    @DisableSceneContainer

    fun blurBecomesMaxValueImmediately() =

        testScope.runTest {

            val values by collectValues(underTest.windowBlurRadius)



            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0.0f, 0.2f, 0.3f, 0.65f, 0.7f, 1.0f),

                startValue = kosmos.blurConfig.minBlurRadiusPx,

                endValue = kosmos.blurConfig.minBlurRadiusPx,

                actualValuesProvider = { values },

                transitionFactory = { step, transitionState ->

                    TransitionStep(

                        from = KeyguardState.PRIMARY_BOUNCER,

                        to = KeyguardState.OCCLUDED,

                        value = step,

                        transitionState = transitionState,

                        ownerName = "PrimaryBouncerToOccludedTransitionViewModelTest",

                    )

                },

                checkInterpolatedValues = false,

            )

        }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.keyguard.domain.interactor 


import android.animation.ValueAnimator

import com.android.app.animation.Interpolators

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.Flags.communalSceneKtfRefactor

import com.android.systemui.Flags.restartDreamOnUnocclude

import com.android.systemui.communal.domain.interactor.CommunalInteractor
@@ -38,7 +39,6 @@ import javax.inject.Inject 
import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import com.android.app.tracing.coroutines.launchTraced as launch



@SysUISingleton

class FromOccludedTransitionInteractor
@@ -222,6 +222,7 @@ constructor( 
        const val TAG = "FromOccludedTransitionInteractor"

        private val DEFAULT_DURATION = 500.milliseconds

        val TO_ALTERNATE_BOUNCER_DURATION = DEFAULT_DURATION

        val TO_PRIMARY_BOUNCER_DURATION = DEFAULT_DURATION

        val TO_AOD_DURATION = DEFAULT_DURATION

        val TO_DOZING_DURATION = DEFAULT_DURATION

        val TO_GLANCEABLE_HUB_DURATION = 250.milliseconds

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/PrimaryBouncerTransition.kt

+10 −0
Original line number Diff line number Diff line
@@ -25,11 +25,13 @@ import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionV 
import com.android.systemui.keyguard.ui.viewmodel.DozingToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.LockscreenToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.OccludedToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToAodTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToDozingTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGlanceableHubTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToLockscreenTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToOccludedTransitionViewModel

import com.android.systemui.res.R

import com.android.systemui.window.flag.WindowBlurFlag

import dagger.Binds
@@ -92,6 +94,10 @@ interface PrimaryBouncerTransitionModule { 
        impl: GlanceableHubToPrimaryBouncerTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromOccluded(impl: OccludedToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toAod(impl: PrimaryBouncerToAodTransitionViewModel): PrimaryBouncerTransition
@@ -114,6 +120,10 @@ interface PrimaryBouncerTransitionModule { 
    @IntoSet

    fun toGone(impl: PrimaryBouncerToGoneTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toOccluded(impl: PrimaryBouncerToOccludedTransitionViewModel): PrimaryBouncerTransition



    companion object {

        @Provides

        @SysUISingleton

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

0 → 100644
+45 −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 com.android.systemui.dagger.SysUISingleton

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

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

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

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

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import com.android.systemui.keyguard.ui.transitions.BlurConfig

import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransition

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow



@SysUISingleton

class OccludedToPrimaryBouncerTransitionViewModel

@Inject

constructor(blurConfig: BlurConfig, animationFlow: KeyguardTransitionAnimationFlow) :

    PrimaryBouncerTransition {

    private val transitionAnimation =

        animationFlow

            .setup(

                duration = FromOccludedTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,

                edge = Edge.INVALID,

            )

            .setupWithoutSceneContainer(edge = Edge.create(OCCLUDED, PRIMARY_BOUNCER))



    override val windowBlurRadius: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)

}