Merge "Fix lockscreen flash when closing activities" into main (98112a97) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalTransitionViewModel.kt

+10 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.communal.ui.viewmodel
		import android.graphics.Color
		import com.android.systemui.communal.domain.interactor.CommunalInteractor
		import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor
		import com.android.systemui.communal.shared.model.CommunalScenes
		import com.android.systemui.communal.util.CommunalColors
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		@@ -58,9 +59,17 @@ constructor(
		dreamToGlanceableHubTransitionViewModel: DreamingToGlanceableHubTransitionViewModel,
		glanceableHubToDreamTransitionViewModel: GlanceableHubToDreamingTransitionViewModel,
		communalInteractor: CommunalInteractor,
		communalSceneInteractor: CommunalSceneInteractor,
		private val communalSceneInteractor: CommunalSceneInteractor,
		keyguardTransitionInteractor: KeyguardTransitionInteractor
		) {
		/**
		* Snaps to [CommunalScenes.Communal], showing the glanceable hub immediately without any
		* transition.
		*/
		fun snapToCommunal() {
		communalSceneInteractor.snapToScene(CommunalScenes.Communal)
		}

		// Show UMO on glanceable hub immediately on transition into glanceable hub
		private val showUmoFromOccludedToGlanceableHub: Flow<Boolean> =
		keyguardTransitionInteractor

+2 −0

Original line number	Diff line number	Diff line
		@@ -1278,6 +1278,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		initAlphaForAnimationTargets(wallpapers);
		if (isDream) {
		mDreamViewModel.get().startTransitionFromDream();
		} else {
		mCommunalTransitionViewModel.get().snapToCommunal();
		}
		mUnoccludeFinishedCallback = finishedCallback;
		return;