Merge "Support GONE->LOCKSCREEN" into main (db6f702b) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -43,9 +43,11 @@ constructor(
		transitionAnimation.sharedFlow(
		duration = 250.milliseconds,
		onStep = { it },
		onCancel = { 0f },
		onCancel = { 1f },
		)

		val lockscreenAlpha: Flow<Float> = shortcutsAlpha

		val deviceEntryBackgroundViewAlpha: Flow<Float> =
		transitionAnimation.immediatelyTransitionTo(1f)

+2 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ constructor(
		private val goneToAodTransitionViewModel: GoneToAodTransitionViewModel,
		private val goneToDozingTransitionViewModel: GoneToDozingTransitionViewModel,
		private val goneToDreamingTransitionViewModel: GoneToDreamingTransitionViewModel,
		private val goneToLockscreenTransitionViewModel: GoneToLockscreenTransitionViewModel,
		private val lockscreenToAodTransitionViewModel: LockscreenToAodTransitionViewModel,
		private val lockscreenToDozingTransitionViewModel: LockscreenToDozingTransitionViewModel,
		private val lockscreenToDreamingTransitionViewModel: LockscreenToDreamingTransitionViewModel,
		@@ -218,6 +219,7 @@ constructor(
		goneToAodTransitionViewModel.enterFromTopAnimationAlpha,
		goneToDozingTransitionViewModel.lockscreenAlpha,
		goneToDreamingTransitionViewModel.lockscreenAlpha,
		goneToLockscreenTransitionViewModel.lockscreenAlpha,
		lockscreenToAodTransitionViewModel.lockscreenAlpha(viewState),
		lockscreenToDozingTransitionViewModel.lockscreenAlpha,
		lockscreenToDreamingTransitionViewModel.lockscreenAlpha,

0 → 100644

+30 −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.
		*/

		@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

		var Kosmos.goneToLockscreenTransitionViewModel by Fixture {
		GoneToLockscreenTransitionViewModel(
		animationFlow = keyguardTransitionAnimationFlow,
		)
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ val Kosmos.keyguardRootViewModel by Fixture {
		goneToAodTransitionViewModel = goneToAodTransitionViewModel,
		goneToDozingTransitionViewModel = goneToDozingTransitionViewModel,
		goneToDreamingTransitionViewModel = goneToDreamingTransitionViewModel,
		goneToLockscreenTransitionViewModel = goneToLockscreenTransitionViewModel,
		lockscreenToAodTransitionViewModel = lockscreenToAodTransitionViewModel,
		lockscreenToDozingTransitionViewModel = lockscreenToDozingTransitionViewModel,
		lockscreenToDreamingTransitionViewModel = lockscreenToDreamingTransitionViewModel,