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

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

Merge "Create a helper class for BlurConfig that provides min and max blur radius" into main

parents f4acbe21 8db4debc

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

+5 −5
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 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.TransitionStep

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.testKosmos
@@ -79,8 +79,8 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() 


            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0f, 0f, 0.1f, 0.2f, 0.3f, 1f),

                startValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                endValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                startValue = kosmos.blurConfig.maxBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                checkInterpolatedValues = false,

                transitionFactory = ::step,

                actualValuesProvider = { values },
@@ -95,8 +95,8 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() 


            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0f, 0f, 0.1f, 0.2f, 0.3f, 1f),

                startValue = PrimaryBouncerTransition.MIN_BACKGROUND_BLUR_RADIUS,

                endValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                startValue = kosmos.blurConfig.minBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                transitionFactory = ::step,

                actualValuesProvider = { values },

            )

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

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.coroutines.collectValues

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

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -44,8 +44,8 @@ class AodToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() { 


            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0.0f, 0.0f, 0.3f, 0.4f, 0.5f, 1.0f),

                startValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                endValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                startValue = kosmos.blurConfig.maxBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                transitionFactory = { value, state ->

                    TransitionStep(

                        from = KeyguardState.AOD,

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

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ class BouncerWindowBlurTestUtil( 
        if (checkInterpolatedValues) {

            assertThat(actualValuesProvider.invoke())

                .containsExactly(*transitionProgress.map(interpolationFunction).toTypedArray())

                .inOrder()

        } else {

            assertThat(actualValuesProvider.invoke()).contains(endValue)

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 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.TransitionStep

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

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
@@ -78,8 +78,8 @@ class DozingToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() { 


            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

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

                startValue = PrimaryBouncerTransition.MIN_BACKGROUND_BLUR_RADIUS,

                endValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                startValue = kosmos.blurConfig.minBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                actualValuesProvider = { values },

                transitionFactory = ::step,

            )

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

+5 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState 
import com.android.systemui.keyguard.shared.model.StatusBarState

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

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.scene.data.repository.sceneContainerRepository

import com.android.systemui.scene.shared.flag.SceneContainerFlag
@@ -161,8 +161,8 @@ class LockscreenToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameteriza 


            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

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

                startValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                endValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                startValue = kosmos.blurConfig.maxBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                actualValuesProvider = { values },

                transitionFactory = ::step,

                checkInterpolatedValues = false,
@@ -178,8 +178,8 @@ class LockscreenToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameteriza 


            kosmos.bouncerWindowBlurTestUtil.assertTransitionToBlurRadius(

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

                startValue = PrimaryBouncerTransition.MIN_BACKGROUND_BLUR_RADIUS,

                endValue = PrimaryBouncerTransition.MAX_BACKGROUND_BLUR_RADIUS,

                startValue = kosmos.blurConfig.minBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                actualValuesProvider = { values },

                transitionFactory = ::step,

            )