Merge "[flexiglass] Adds CUI marker when locking and entering AOD" into main (67e5e61c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -163,10 +163,6 @@ constructor(
		}

		private fun bindJankViewModel() {
		if (SceneContainerFlag.isEnabled) {
		return
		}

		jankHandle?.dispose()
		jankHandle =
		KeyguardJankBinder.bind(

+11 −7

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import com.android.systemui.keyguard.shared.model.TransitionState
		import com.android.systemui.keyguard.shared.model.TransitionStep
		import com.android.systemui.keyguard.ui.viewmodel.KeyguardJankViewModel
		import com.android.systemui.lifecycle.repeatWhenAttached
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.DisposableHandle
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		@@ -79,6 +80,8 @@ object KeyguardJankBinder {
		}
		}

		// The following is already done in KeyguardTransitionAnimationCallbackImpl.
		if (!SceneContainerFlag.isEnabled) {
		launch {
		viewModel.lockscreenToAodTransition.collect {
		processStep(it, CUJ_LOCKSCREEN_TRANSITION_TO_AOD)
		@@ -94,3 +97,4 @@ object KeyguardJankBinder {
		}
		}
		}
		}