Merge "Hide DeviceEntryIcon on alternateBouncer => dreaming transition" into main (67b6b390) · Commits · e / os / android_frameworks_base

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

0 → 100644

+112 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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 android.platform.test.flag.junit.FlagsParameterization
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.flags.andSceneContainer
		import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
		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.kosmos.Kosmos
		import com.android.systemui.kosmos.collectValues
		import com.android.systemui.kosmos.runTest
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.scene.data.repository.Transition
		import com.android.systemui.scene.data.repository.setSceneTransition
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.flow.flowOf
		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

		@SmallTest
		@RunWith(ParameterizedAndroidJunit4::class)
		class AlternateBouncerToDreamingTransitionViewModelTest(flags: FlagsParameterization) :
		SysuiTestCase() {
		private val kosmos = testKosmos()
		private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository
		private lateinit var underTest: AlternateBouncerToDreamingTransitionViewModel

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

		init {
		mSetFlagsRule.setFlagsParameterization(flags)
		}

		@Before
		fun setUp() {
		keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository
		underTest = kosmos.alternateBouncerToDreamingTransitionViewModel
		}

		@Test
		fun deviceEntryParentViewAlpha() =
		kosmos.runTest {
		val values by collectValues(underTest.deviceEntryParentViewAlpha)
		startLockscreenToDreamSceneTransition()

		fakeKeyguardTransitionRepository.sendTransitionSteps(
		steps =
		listOf(
		step(0f, TransitionState.STARTED),
		step(0f),
		step(.3f),
		step(.5f),
		step(1f),
		step(1f, TransitionState.FINISHED),
		),
		testScope = testScope,
		)

		// immediately 0f
		values.forEach { assertThat(it).isEqualTo(0f) }
		}

		private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {
		return TransitionStep(
		from = KeyguardState.ALTERNATE_BOUNCER,
		to = KeyguardState.DREAMING,
		value = value,
		transitionState = state,
		ownerName = "AlternateBounceToDreamingTransitionViewModelTest",
		)
		}

		private fun Kosmos.startLockscreenToDreamSceneTransition() {
		if (SceneContainerFlag.isEnabled) {
		setSceneTransition(
		Transition(from = Scenes.Lockscreen, to = Scenes.Dream, progress = flowOf(0f))
		)
		}
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -251,5 +251,6 @@ constructor(
		val TO_LOCKSCREEN_DURATION = 300.milliseconds
		val TO_OCCLUDED_DURATION = TRANSITION_DURATION_MS
		val TO_PRIMARY_BOUNCER_DURATION = TRANSITION_DURATION_MS
		val TO_DREAMING_DURATION = TRANSITION_DURATION_MS
		}
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package com.android.systemui.keyguard.ui.transitions

		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToAodTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToDozingTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToDreamingTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToLockscreenTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToOccludedTransitionViewModel
		@@ -77,6 +78,12 @@ abstract class DeviceEntryIconTransitionModule {
		impl: AlternateBouncerToDozingTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun alternateBouncerToDreaming(
		impl: AlternateBouncerToDreamingTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun alternateBouncerToGone(

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

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.FromAlternateBouncerTransitionInteractor
		import com.android.systemui.keyguard.shared.model.Edge
		import com.android.systemui.keyguard.shared.model.KeyguardState.ALTERNATE_BOUNCER
		import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
		import com.android.systemui.scene.shared.model.Scenes
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow

		/**
		* Breaks down ALTERNATE BOUNCER->DREAMING transition into discrete steps for corresponding views to
		* consume.
		*/
		@SysUISingleton
		class AlternateBouncerToDreamingTransitionViewModel
		@Inject
		constructor(animationFlow: KeyguardTransitionAnimationFlow) : DeviceEntryIconTransition {
		private val transitionAnimation =
		animationFlow
		.setup(
		duration = FromAlternateBouncerTransitionInteractor.TO_DREAMING_DURATION,
		edge = Edge.create(from = ALTERNATE_BOUNCER, to = Scenes.Dream),
		)
		.setupWithoutSceneContainer(edge = Edge.create(from = ALTERNATE_BOUNCER, to = DREAMING))

		override val deviceEntryParentViewAlpha: Flow<Float> =
		transitionAnimation.immediatelyTransitionTo(0f)
		}

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

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture

		val Kosmos.alternateBouncerToDreamingTransitionViewModel by Fixture {
		AlternateBouncerToDreamingTransitionViewModel(animationFlow = keyguardTransitionAnimationFlow)
		}