Merge "Fix lock icon missing on hub" into main (b1871232) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -232,5 +232,6 @@ constructor(
		val TO_LOCKSCREEN_DURATION = DEFAULT_DURATION
		val TO_GONE_DURATION = DEFAULT_DURATION
		val TO_PRIMARY_BOUNCER_DURATION = DEFAULT_DURATION
		val TO_GLANCEABLE_HUB_DURATION = DEFAULT_DURATION
		}
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ constructor(
		KeyguardState.DOZING -> TO_DOZING_DURATION
		KeyguardState.GONE -> TO_GONE_DURATION
		KeyguardState.LOCKSCREEN -> TO_LOCKSCREEN_DURATION
		KeyguardState.GLANCEABLE_HUB -> TO_GLANCEABLE_HUB_DURATION
		else -> DEFAULT_DURATION
		}.inWholeMilliseconds
		}
		@@ -245,6 +246,7 @@ constructor(
		val TO_GONE_DURATION = 500.milliseconds
		val TO_GONE_SHORT_DURATION = 200.milliseconds
		val TO_LOCKSCREEN_DURATION = 450.milliseconds
		val TO_GLANCEABLE_HUB_DURATION = DEFAULT_DURATION
		val TO_GONE_SURFACE_BEHIND_VISIBLE_THRESHOLD = 0.5f
		}
		}

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import com.android.systemui.keyguard.ui.viewmodel.AodToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToOccludedTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToGlanceableHubTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToGoneTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToLockscreenTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DozingToOccludedTransitionViewModel
		@@ -49,6 +50,7 @@ import com.android.systemui.keyguard.ui.viewmodel.OccludedToLockscreenTransition
		import com.android.systemui.keyguard.ui.viewmodel.OffToLockscreenTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToAodTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToDozingTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGlanceableHubTransitionViewModel
		import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToLockscreenTransitionViewModel
		import dagger.Binds
		import dagger.Module
		@@ -253,4 +255,16 @@ abstract class DeviceEntryIconTransitionModule {
		abstract fun goneToGlanceableHub(
		impl: GoneToGlanceableHubTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun primaryBouncerToGlanceableHub(
		impl: PrimaryBouncerToGlanceableHubTransitionViewModel
		): DeviceEntryIconTransition

		@Binds
		@IntoSet
		abstract fun dozingToGlanceableHub(
		impl: DozingToGlanceableHubTransitionViewModel
		): DeviceEntryIconTransition
		}

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

0 → 100644

+44 −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.FromDozingTransitionInteractor.Companion.TO_GLANCEABLE_HUB_DURATION
		import com.android.systemui.keyguard.shared.model.Edge
		import com.android.systemui.keyguard.shared.model.KeyguardState.DOZING
		import com.android.systemui.keyguard.shared.model.KeyguardState.GLANCEABLE_HUB
		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

		@SysUISingleton
		class DozingToGlanceableHubTransitionViewModel
		@Inject
		constructor(animationFlow: KeyguardTransitionAnimationFlow) : DeviceEntryIconTransition {
		private val transitionAnimation =
		animationFlow
		.setup(
		duration = TO_GLANCEABLE_HUB_DURATION,
		edge = Edge.create(DOZING, Scenes.Communal)
		)
		.setupWithoutSceneContainer(edge = Edge.create(DOZING, GLANCEABLE_HUB))

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

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

0 → 100644

+44 −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.FromPrimaryBouncerTransitionInteractor.Companion.TO_GLANCEABLE_HUB_DURATION
		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.DeviceEntryIconTransition
		import com.android.systemui.scene.shared.model.Scenes
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow

		@SysUISingleton
		class PrimaryBouncerToGlanceableHubTransitionViewModel
		@Inject
		constructor(animationFlow: KeyguardTransitionAnimationFlow) : DeviceEntryIconTransition {
		private val transitionAnimation =
		animationFlow
		.setup(
		duration = TO_GLANCEABLE_HUB_DURATION,
		edge = Edge.create(PRIMARY_BOUNCER, Scenes.Communal)
		)
		.setupWithoutSceneContainer(edge = Edge.create(PRIMARY_BOUNCER, GLANCEABLE_HUB))

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