Merge "Support UDFPS alternate bouncer -> primary bouncer transition" into main (d29b5265) · Commits · e / os / android_frameworks_base

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

0 → 100644

+82 −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.Flags
		import com.android.systemui.flags.fakeFeatureFlagsClassic
		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.testScope
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.test.runTest
		import org.junit.Test
		import org.junit.runner.RunWith

		@ExperimentalCoroutinesApi
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {
		private val kosmos =
		testKosmos().apply {
		fakeFeatureFlagsClassic.apply {
		set(Flags.REFACTOR_KEYGUARD_DISMISS_INTENT, false)
		set(Flags.FULL_SCREEN_USER_SWITCHER, false)
		}
		}
		private val testScope = kosmos.testScope
		private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository
		private val underTest = kosmos.alternateBouncerToPrimaryBouncerTransitionViewModel

		@Test
		fun deviceEntryParentViewDisappear() =
		testScope.runTest {
		val values by collectValues(underTest.deviceEntryParentViewAlpha)

		keyguardTransitionRepository.sendTransitionSteps(
		listOf(
		step(0f, TransitionState.STARTED),
		step(0f),
		step(0.1f),
		step(0.2f),
		step(0.3f),
		step(1f),
		),
		testScope,
		)

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

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

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -149,5 +149,6 @@ constructor(
		val TRANSITION_DURATION_MS = 300.milliseconds
		val TO_GONE_DURATION = 500.milliseconds
		val TO_AOD_DURATION = TRANSITION_DURATION_MS
		val TO_PRIMARY_BOUNCER_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.AlternateBouncerToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToLockscreenTransitionViewModel
		@@ -51,6 +52,12 @@ abstract class DeviceEntryIconTransitionModule {
		impl: AlternateBouncerToGoneTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun alternateBouncerToPrimaryBouncer(
		impl: AlternateBouncerToPrimaryBouncerTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun aodToLockscreen(

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

0 → 100644

+48 −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.FromAlternateBouncerTransitionInteractor
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
		import javax.inject.Inject
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.Flow

		/**
		* Breaks down ALTERNATE BOUNCER->PRIMARY BOUNCER transition into discrete steps for corresponding
		* views to consume.
		*/
		@ExperimentalCoroutinesApi
		@SysUISingleton
		class AlternateBouncerToPrimaryBouncerTransitionViewModel
		@Inject
		constructor(
		animationFlow: KeyguardTransitionAnimationFlow,
		) : DeviceEntryIconTransition {
		private val transitionAnimation =
		animationFlow.setup(
		duration = FromAlternateBouncerTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,
		from = KeyguardState.ALTERNATE_BOUNCER,
		to = KeyguardState.PRIMARY_BOUNCER,
		)

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

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

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.
		*/

		@file:OptIn(ExperimentalCoroutinesApi::class)

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

		val Kosmos.alternateBouncerToPrimaryBouncerTransitionViewModel by Fixture {
		AlternateBouncerToPrimaryBouncerTransitionViewModel(
		animationFlow = keyguardTransitionAnimationFlow,
		)
		}