Merge "Blur the root window view when we transition from GlanceableHub to PrimaryBouncer" into main (8e6fa6d6) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToPrimaryBouncerTransitionViewModelTest.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 GlanceableHubToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private val underTest by lazy { kosmos.glanceableHubToPrimaryBouncerTransitionViewModel }

		@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.GLANCEABLE_HUB,
		to = KeyguardState.PRIMARY_BOUNCER,
		value = step,
		transitionState = transitionState,
		ownerName = "GlanceableHubToPrimaryBouncerTransitionViewModelTest",
		)
		},
		checkInterpolatedValues = false,
		)
		}
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel
		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.PrimaryBouncerToAodTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToDozingTransitionViewModel
		@@ -76,6 +77,12 @@ interface PrimaryBouncerTransitionModule {
		impl: LockscreenToPrimaryBouncerTransitionViewModel
		): PrimaryBouncerTransition

		@Binds
		@IntoSet
		fun fromGlanceableHub(
		impl: GlanceableHubToPrimaryBouncerTransitionViewModel
		): PrimaryBouncerTransition

		@Binds
		@IntoSet
		fun toAod(impl: PrimaryBouncerToAodTransitionViewModel): PrimaryBouncerTransition

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToPrimaryBouncerTransitionViewModel.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.FromLockscreenTransitionInteractor
		import com.android.systemui.keyguard.shared.model.Edge
		import com.android.systemui.keyguard.shared.model.KeyguardState.GLANCEABLE_HUB
		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 GlanceableHubToPrimaryBouncerTransitionViewModel
		@Inject
		constructor(private val blurConfig: BlurConfig, animationFlow: KeyguardTransitionAnimationFlow) :
		PrimaryBouncerTransition {
		private val transitionAnimation =
		animationFlow
		.setup(
		duration = FromLockscreenTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,
		edge = Edge.INVALID,
		)
		.setupWithoutSceneContainer(edge = Edge.create(GLANCEABLE_HUB, PRIMARY_BOUNCER))

		override val windowBlurRadius: Flow<Float> =
		transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)
		}

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToPrimaryBouncerTransitionViewModelKosmos.kt

0 → 100644

+29 −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.keyguard.ui.keyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.transitions.blurConfig
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture

		val Kosmos.glanceableHubToPrimaryBouncerTransitionViewModel by Fixture {
		GlanceableHubToPrimaryBouncerTransitionViewModel(
		animationFlow = keyguardTransitionAnimationFlow,
		blurConfig = blurConfig,
		)
		}