Merge "Shade should be blurred only when shade blur flag is on" into main (4c593816) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags.FLAG_BOUNCER_UI_REVAMP
		import com.android.systemui.Flags.FLAG_NOTIFICATION_SHADE_BLUR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectValues
		import com.android.systemui.flags.BrokenWithSceneContainer
		@@ -97,6 +98,7 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase()
		}

		@Test
		@EnableFlags(FLAG_NOTIFICATION_SHADE_BLUR)
		fun blurRadiusGoesToMaximumWhenShadeIsExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.platform.test.flag.junit.FlagsParameterization
		import androidx.test.filters.SmallTest
		import com.android.compose.animation.scene.ObservableTransitionState
		import com.android.systemui.Flags.FLAG_BOUNCER_UI_REVAMP
		import com.android.systemui.Flags.FLAG_NOTIFICATION_SHADE_BLUR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.coroutines.collectValues
		@@ -155,6 +156,7 @@ class LockscreenToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameteriza
		}

		@Test
		@EnableFlags(FLAG_NOTIFICATION_SHADE_BLUR)
		@BrokenWithSceneContainer(388068805)
		fun blurRadiusIsMaxWhenShadeIsExpanded() =
		testScope.runTest {

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

+62 −16

Original line number	Diff line number	Diff line
		@@ -16,50 +16,96 @@

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

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.flag.junit.FlagsParameterization
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags.FLAG_NOTIFICATION_SHADE_BLUR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectValues
		import com.android.systemui.flags.DisableSceneContainer
		import com.android.systemui.flags.BrokenWithSceneContainer
		import com.android.systemui.flags.andSceneContainer
		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.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.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import platform.test.runner.parameterized.ParameterizedAndroidJunit4
		import platform.test.runner.parameterized.Parameters

		@ExperimentalCoroutinesApi
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class OccludedToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {
		@RunWith(ParameterizedAndroidJunit4::class)
		class OccludedToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameterization) :
		SysuiTestCase() {
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private val underTest by lazy { kosmos.occludedToPrimaryBouncerTransitionViewModel }
		private lateinit var underTest: OccludedToPrimaryBouncerTransitionViewModel

		companion object {
		@JvmStatic
		@Parameters(name = "{0}")
		fun getParams(): List<FlagsParameterization> {
		return FlagsParameterization.allCombinationsOf().andSceneContainer()
		}
		}

		init {
		mSetFlagsRule.setFlagsParameterization(flags)
		}

		@Before
		fun setup() {
		underTest = kosmos.occludedToPrimaryBouncerTransitionViewModel
		}

		@Test
		@DisableSceneContainer
		fun blurBecomesMaxValueImmediately() =
		@BrokenWithSceneContainer(388068805)
		fun notificationsAreBlurredImmediatelyWhenBouncerIsOpenedAndShadeIsExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.notificationBlurRadius)
		kosmos.keyguardWindowBlurTestUtil.shadeExpanded(true)

		kosmos.keyguardWindowBlurTestUtil.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,
		checkInterpolatedValues = false,
		)
		}

		@Test
		@EnableFlags(FLAG_NOTIFICATION_SHADE_BLUR)
		@BrokenWithSceneContainer(388068805)
		fun blurBecomesMaxValueImmediatelyWhenShadeIsAlreadyExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)
		kosmos.keyguardWindowBlurTestUtil.shadeExpanded(true)

		kosmos.keyguardWindowBlurTestUtil.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(
		transitionFactory = ::step,
		checkInterpolatedValues = false,
		)
		}

		fun step(value: Float, state: TransitionState = TransitionState.RUNNING): TransitionStep {
		return TransitionStep(
		from = KeyguardState.OCCLUDED,
		to = KeyguardState.PRIMARY_BOUNCER,
		value = step,
		transitionState = transitionState,
		value = value,
		transitionState = state,
		ownerName = "OccludedToPrimaryBouncerTransitionViewModelTest",
		)
		},
		checkInterpolatedValues = false,
		)
		}
		}

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

+35 −4

Original line number	Diff line number	Diff line
		@@ -16,12 +16,16 @@

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

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.flag.junit.FlagsParameterization
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags.FLAG_NOTIFICATION_SHADE_BLUR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.coroutines.collectValues
		import com.android.systemui.flags.BrokenWithSceneContainer
		import com.android.systemui.flags.andSceneContainer
		import com.android.systemui.keyguard.data.repository.biometricSettingsRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.KeyguardState
		@@ -35,13 +39,17 @@ 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
		import org.junit.runner.RunWith
		import platform.test.runner.parameterized.ParameterizedAndroidJunit4
		import platform.test.runner.parameterized.Parameters

		@ExperimentalCoroutinesApi
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class PrimaryBouncerToLockscreenTransitionViewModelTest : SysuiTestCase() {
		@RunWith(ParameterizedAndroidJunit4::class)
		class PrimaryBouncerToLockscreenTransitionViewModelTest(flags: FlagsParameterization) :
		SysuiTestCase() {
		val kosmos = testKosmos()
		val testScope = kosmos.testScope

		@@ -49,9 +57,27 @@ class PrimaryBouncerToLockscreenTransitionViewModelTest : SysuiTestCase() {
		val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository
		val biometricSettingsRepository = kosmos.biometricSettingsRepository

		val underTest = kosmos.primaryBouncerToLockscreenTransitionViewModel
		private lateinit var underTest: PrimaryBouncerToLockscreenTransitionViewModel

		companion object {
		@JvmStatic
		@Parameters(name = "{0}")
		fun getParams(): List<FlagsParameterization> {
		return FlagsParameterization.allCombinationsOf().andSceneContainer()
		}
		}

		init {
		mSetFlagsRule.setFlagsParameterization(flags)
		}

		@Before
		fun setup() {
		underTest = kosmos.primaryBouncerToLockscreenTransitionViewModel
		}

		@Test
		@BrokenWithSceneContainer(392346450)
		fun lockscreenAlphaStartsFromViewStateAccessorAlpha() =
		testScope.runTest {
		val viewState = ViewStateAccessor(alpha = { 0.5f })
		@@ -70,6 +96,7 @@ class PrimaryBouncerToLockscreenTransitionViewModelTest : SysuiTestCase() {
		}

		@Test
		@BrokenWithSceneContainer(392346450)
		fun deviceEntryParentViewAlpha() =
		testScope.runTest {
		val deviceEntryParentViewAlpha by collectLastValue(underTest.deviceEntryParentViewAlpha)
		@@ -89,6 +116,7 @@ class PrimaryBouncerToLockscreenTransitionViewModelTest : SysuiTestCase() {
		}

		@Test
		@BrokenWithSceneContainer(392346450)
		fun deviceEntryBackgroundViewAlpha_udfpsEnrolled_show() =
		testScope.runTest {
		fingerprintPropertyRepository.supportsUdfps()
		@@ -113,6 +141,7 @@ class PrimaryBouncerToLockscreenTransitionViewModelTest : SysuiTestCase() {
		}

		@Test
		@BrokenWithSceneContainer(388068805)
		fun blurRadiusGoesFromMaxToMinWhenShadeIsNotExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)
		@@ -128,6 +157,8 @@ class PrimaryBouncerToLockscreenTransitionViewModelTest : SysuiTestCase() {
		}

		@Test
		@EnableFlags(FLAG_NOTIFICATION_SHADE_BLUR)
		@BrokenWithSceneContainer(388068805)
		fun blurRadiusRemainsAtMaxWhenShadeIsExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)

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

+32 −3

Original line number	Diff line number	Diff line
		@@ -16,11 +16,13 @@

		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.flags.DisableSceneContainer
		import com.android.systemui.flags.BrokenWithSceneContainer
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.model.TransitionStep
		import com.android.systemui.keyguard.ui.transitions.blurConfig
		@@ -40,10 +42,37 @@ class PrimaryBouncerToOccludedTransitionViewModelTest : SysuiTestCase() {
		private val underTest by lazy { kosmos.primaryBouncerToOccludedTransitionViewModel }

		@Test
		@DisableSceneContainer
		fun blurBecomesMaxValueImmediately() =
		@BrokenWithSceneContainer(388068805)
		fun blurBecomesMinValueImmediatelyWhenShadeIsNotExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)
		kosmos.keyguardWindowBlurTestUtil.shadeExpanded(false)

		kosmos.keyguardWindowBlurTestUtil.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,
		)
		}

		@Test
		@BrokenWithSceneContainer(388068805)
		@EnableFlags(Flags.FLAG_NOTIFICATION_SHADE_BLUR)
		fun blurBecomesMaxValueImmediatelyWhenShadeIsExpanded() =
		testScope.runTest {
		val values by collectValues(underTest.windowBlurRadius)
		kosmos.keyguardWindowBlurTestUtil.shadeExpanded(false)

		kosmos.keyguardWindowBlurTestUtil.assertTransitionToBlurRadius(
		transitionProgress = listOf(0.0f, 0.2f, 0.3f, 0.65f, 0.7f, 1.0f),