Merge "Transitions - Allow ->GONE to be canceled" into tm-qpr-dev (74fb070d) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,8 +31,10 @@ import javax.inject.Inject
	import kotlin.time.Duration		import kotlin.time.Duration
	import kotlin.time.Duration.Companion.milliseconds		import kotlin.time.Duration.Companion.milliseconds
	import kotlinx.coroutines.CoroutineScope		import kotlinx.coroutines.CoroutineScope
			import kotlinx.coroutines.delay
	import kotlinx.coroutines.flow.collect		import kotlinx.coroutines.flow.collect
	import kotlinx.coroutines.flow.combine		import kotlinx.coroutines.flow.combine
			import kotlinx.coroutines.flow.onEach
	import kotlinx.coroutines.launch		import kotlinx.coroutines.launch

	@SysUISingleton		@SysUISingleton
	@@ -87,6 +89,9 @@ constructor(
	private fun listenForDreamingToOccluded() {		private fun listenForDreamingToOccluded() {
	scope.launch {		scope.launch {
	keyguardInteractor.isDreaming		keyguardInteractor.isDreaming
			// Add a slight delay, as dreaming and occluded events will arrive with a small gap
			// in time. This prevents a transition to OCCLUSION happening prematurely.
			.onEach { delay(50) }
	.sample(		.sample(
	combine(		combine(
	keyguardInteractor.isKeyguardOccluded,		keyguardInteractor.isKeyguardOccluded,

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

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -50,10 +50,9 @@ constructor(
	private fun listenForGoneToDreaming() {		private fun listenForGoneToDreaming() {
	scope.launch {		scope.launch {
	keyguardInteractor.isAbleToDream		keyguardInteractor.isAbleToDream
	.sample(keyguardTransitionInteractor.finishedKeyguardState, ::Pair)		.sample(keyguardTransitionInteractor.startedKeyguardTransitionStep, ::Pair)
	.collect { pair ->		.collect { (isAbleToDream, lastStartedStep) ->
	val (isAbleToDream, keyguardState) = pair		if (isAbleToDream && lastStartedStep.to == KeyguardState.GONE) {
	if (isAbleToDream && keyguardState == KeyguardState.GONE) {
	keyguardTransitionRepository.startTransition(		keyguardTransitionRepository.startTransition(
	TransitionInfo(		TransitionInfo(
	name,		name,
	@@ -72,15 +71,15 @@ constructor(
	keyguardInteractor.wakefulnessModel		keyguardInteractor.wakefulnessModel
	.sample(		.sample(
	combine(		combine(
	keyguardTransitionInteractor.finishedKeyguardState,		keyguardTransitionInteractor.startedKeyguardTransitionStep,
	keyguardInteractor.isAodAvailable,		keyguardInteractor.isAodAvailable,
	::Pair		::Pair
	),		),
	::toTriple		::toTriple
	)		)
	.collect { (wakefulnessState, keyguardState, isAodAvailable) ->		.collect { (wakefulnessState, lastStartedStep, isAodAvailable) ->
	if (		if (
	keyguardState == KeyguardState.GONE &&		lastStartedStep.to == KeyguardState.GONE &&
	wakefulnessState.state == WakefulnessState.STARTING_TO_SLEEP		wakefulnessState.state == WakefulnessState.STARTING_TO_SLEEP
	) {		) {
	keyguardTransitionRepository.startTransition(		keyguardTransitionRepository.startTransition(