Merge "Move From* Interactors to background scope" into main (f4b92dba) · Commits · e / os / android_frameworks_base

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

+18 −11

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@ package com.android.systemui.keyguard.domain.interactor

		import android.animation.ValueAnimator
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.power.domain.interactor.PowerInteractor
		@@ -28,6 +29,7 @@ import com.android.systemui.util.kotlin.sample
		import com.android.wm.shell.animation.Interpolators
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.delay
		import kotlinx.coroutines.flow.combine
		@@ -39,13 +41,18 @@ class FromAlternateBouncerTransitionInteractor
		@Inject
		constructor(
		override val transitionRepository: KeyguardTransitionRepository,
		override val transitionInteractor: KeyguardTransitionInteractor,
		@Application private val scope: CoroutineScope,
		transitionInteractor: KeyguardTransitionInteractor,
		@Background private val scope: CoroutineScope,
		@Background bgDispatcher: CoroutineDispatcher,
		@Main mainDispatcher: CoroutineDispatcher,
		private val keyguardInteractor: KeyguardInteractor,
		private val powerInteractor: PowerInteractor,
		) :
		TransitionInteractor(
		fromState = KeyguardState.ALTERNATE_BOUNCER,
		transitionInteractor = transitionInteractor,
		mainDispatcher = mainDispatcher,
		bgDispatcher = bgDispatcher,
		) {

		override fun start() {
		@@ -65,7 +72,7 @@ constructor(
		.sample(
		combine(
		keyguardInteractor.primaryBouncerShowing,
		transitionInteractor.startedKeyguardTransitionStep,
		startedKeyguardTransitionStep,
		powerInteractor.isAwake,
		keyguardInteractor.isAodAvailable,
		::toQuad
		@@ -102,9 +109,8 @@ constructor(

		private fun listenForAlternateBouncerToGone() {
		scope.launch {
		keyguardInteractor.isKeyguardGoingAway
		.sample(transitionInteractor.finishedKeyguardState, ::Pair)
		.collect { (isKeyguardGoingAway, keyguardState) ->
		keyguardInteractor.isKeyguardGoingAway.sample(finishedKeyguardState, ::Pair).collect {
		(isKeyguardGoingAway, keyguardState) ->
		if (isKeyguardGoingAway && keyguardState == KeyguardState.ALTERNATE_BOUNCER) {
		startTransitionTo(KeyguardState.GONE)
		}
		@@ -115,7 +121,7 @@ constructor(
		private fun listenForAlternateBouncerToPrimaryBouncer() {
		scope.launch {
		keyguardInteractor.primaryBouncerShowing
		.sample(transitionInteractor.startedKeyguardTransitionStep, ::Pair)
		.sample(startedKeyguardTransitionStep, ::Pair)
		.collect { (isPrimaryBouncerShowing, startedKeyguardState) ->
		if (
		isPrimaryBouncerShowing &&
		@@ -139,6 +145,7 @@ constructor(
		}

		companion object {
		const val TAG = "FromAlternateBouncerTransitionInteractor"
		val TRANSITION_DURATION_MS = 300.milliseconds
		val TO_GONE_DURATION = 500.milliseconds
		val TO_AOD_DURATION = TRANSITION_DURATION_MS

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

+18 −14

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@ package com.android.systemui.keyguard.domain.interactor
		import android.animation.ValueAnimator
		import com.android.app.animation.Interpolators
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.BiometricUnlockModel.Companion.isWakeAndUnlock
		import com.android.systemui.keyguard.shared.model.DozeStateModel
		@@ -29,6 +30,7 @@ import com.android.systemui.util.kotlin.Utils.Companion.toTriple
		import com.android.systemui.util.kotlin.sample
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.launch
		@@ -38,12 +40,17 @@ class FromAodTransitionInteractor
		@Inject
		constructor(
		override val transitionRepository: KeyguardTransitionRepository,
		override val transitionInteractor: KeyguardTransitionInteractor,
		@Application private val scope: CoroutineScope,
		transitionInteractor: KeyguardTransitionInteractor,
		@Background private val scope: CoroutineScope,
		@Background bgDispatcher: CoroutineDispatcher,
		@Main mainDispatcher: CoroutineDispatcher,
		private val keyguardInteractor: KeyguardInteractor,
		) :
		TransitionInteractor(
		fromState = KeyguardState.AOD,
		transitionInteractor = transitionInteractor,
		mainDispatcher = mainDispatcher,
		bgDispatcher = bgDispatcher,
		) {

		override fun start() {
		@@ -58,7 +65,7 @@ constructor(
		.dozeTransitionTo(DozeStateModel.FINISH)
		.sample(
		combine(
		transitionInteractor.startedKeyguardTransitionStep,
		startedKeyguardTransitionStep,
		keyguardInteractor.isKeyguardOccluded,
		::Pair
		),
		@@ -77,7 +84,6 @@ constructor(
		} else {
		TransitionModeOnCanceled.LAST_VALUE
		}

		startTransitionTo(
		toState = toState,
		modeOnCanceled = modeOnCanceled,
		@@ -89,13 +95,10 @@ constructor(

		private fun listenForAodToGone() {
		scope.launch {
		keyguardInteractor.biometricUnlockState
		.sample(transitionInteractor.finishedKeyguardState, ::Pair)
		.collect { pair ->
		keyguardInteractor.biometricUnlockState.sample(finishedKeyguardState, ::Pair).collect {
		pair ->
		val (biometricUnlockState, keyguardState) = pair
		if (
		keyguardState == KeyguardState.AOD && isWakeAndUnlock(biometricUnlockState)
		) {
		if (keyguardState == KeyguardState.AOD && isWakeAndUnlock(biometricUnlockState)) {
		startTransitionTo(KeyguardState.GONE)
		}
		}
		@@ -113,6 +116,7 @@ constructor(
		}

		companion object {
		const val TAG = "FromAodTransitionInteractor"
		private val DEFAULT_DURATION = 500.milliseconds
		val TO_LOCKSCREEN_DURATION = 500.milliseconds
		val TO_GONE_DURATION = DEFAULT_DURATION

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

+13 −5

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@ package com.android.systemui.keyguard.domain.interactor
		import android.animation.ValueAnimator
		import com.android.app.animation.Interpolators
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.BiometricUnlockModel.Companion.isWakeAndUnlock
		import com.android.systemui.keyguard.shared.model.KeyguardState
		@@ -28,6 +29,7 @@ import com.android.systemui.util.kotlin.Utils.Companion.toTriple
		import com.android.systemui.util.kotlin.sample
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.launch
		@@ -37,13 +39,18 @@ class FromDozingTransitionInteractor
		@Inject
		constructor(
		override val transitionRepository: KeyguardTransitionRepository,
		override val transitionInteractor: KeyguardTransitionInteractor,
		@Application private val scope: CoroutineScope,
		transitionInteractor: KeyguardTransitionInteractor,
		@Background private val scope: CoroutineScope,
		@Background bgDispatcher: CoroutineDispatcher,
		@Main mainDispatcher: CoroutineDispatcher,
		private val keyguardInteractor: KeyguardInteractor,
		private val powerInteractor: PowerInteractor,
		) :
		TransitionInteractor(
		fromState = KeyguardState.DOZING,
		transitionInteractor = transitionInteractor,
		mainDispatcher = mainDispatcher,
		bgDispatcher = bgDispatcher,
		) {

		override fun start() {
		@@ -57,7 +64,7 @@ constructor(
		powerInteractor.isAwake
		.sample(
		combine(
		transitionInteractor.startedKeyguardTransitionStep,
		startedKeyguardTransitionStep,
		keyguardInteractor.isKeyguardOccluded,
		::Pair
		),
		@@ -76,7 +83,7 @@ constructor(
		private fun listenForDozingToGone() {
		scope.launch {
		keyguardInteractor.biometricUnlockState
		.sample(transitionInteractor.startedKeyguardTransitionStep, ::Pair)
		.sample(startedKeyguardTransitionStep, ::Pair)
		.collect { (biometricUnlockState, lastStartedTransition) ->
		if (
		lastStartedTransition.to == KeyguardState.DOZING &&
		@@ -96,6 +103,7 @@ constructor(
		}

		companion object {
		const val TAG = "FromDozingTransitionInteractor"
		private val DEFAULT_DURATION = 500.milliseconds
		val TO_LOCKSCREEN_DURATION = DEFAULT_DURATION
		}

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

+15 −12

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@ package com.android.systemui.keyguard.domain.interactor
		import android.animation.ValueAnimator
		import com.android.app.animation.Interpolators
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.BiometricUnlockModel
		import com.android.systemui.keyguard.shared.model.DozeStateModel
		@@ -28,6 +29,7 @@ import com.android.systemui.util.kotlin.Utils.Companion.toTriple
		import com.android.systemui.util.kotlin.sample
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.delay
		import kotlinx.coroutines.flow.combine
		@@ -39,12 +41,17 @@ class FromDreamingLockscreenHostedTransitionInteractor
		@Inject
		constructor(
		override val transitionRepository: KeyguardTransitionRepository,
		override val transitionInteractor: KeyguardTransitionInteractor,
		@Application private val scope: CoroutineScope,
		transitionInteractor: KeyguardTransitionInteractor,
		@Background private val scope: CoroutineScope,
		@Background bgDispatcher: CoroutineDispatcher,
		@Main mainDispatcher: CoroutineDispatcher,
		private val keyguardInteractor: KeyguardInteractor,
		) :
		TransitionInteractor(
		fromState = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		transitionInteractor = transitionInteractor,
		mainDispatcher = mainDispatcher,
		bgDispatcher = bgDispatcher,
		) {

		override fun start() {
		@@ -64,7 +71,7 @@ constructor(
		.sample(
		combine(
		keyguardInteractor.dozeTransitionModel,
		transitionInteractor.startedKeyguardTransitionStep,
		startedKeyguardTransitionStep,
		::Pair
		),
		::toTriple
		@@ -88,7 +95,7 @@ constructor(
		.sample(
		combine(
		keyguardInteractor.isKeyguardOccluded,
		transitionInteractor.startedKeyguardTransitionStep,
		startedKeyguardTransitionStep,
		::Pair,
		),
		::toTriple
		@@ -108,7 +115,7 @@ constructor(
		private fun listenForDreamingLockscreenHostedToPrimaryBouncer() {
		scope.launch {
		keyguardInteractor.primaryBouncerShowing
		.sample(transitionInteractor.startedKeyguardTransitionStep, ::Pair)
		.sample(startedKeyguardTransitionStep, ::Pair)
		.collect { (isBouncerShowing, lastStartedTransitionStep) ->
		if (
		isBouncerShowing &&
		@@ -123,7 +130,7 @@ constructor(
		private fun listenForDreamingLockscreenHostedToGone() {
		scope.launch {
		keyguardInteractor.biometricUnlockState
		.sample(transitionInteractor.startedKeyguardTransitionStep, ::Pair)
		.sample(startedKeyguardTransitionStep, ::Pair)
		.collect { (biometricUnlockState, lastStartedTransitionStep) ->
		if (
		lastStartedTransitionStep.to == KeyguardState.DREAMING_LOCKSCREEN_HOSTED &&
		@@ -137,11 +144,7 @@ constructor(

		private fun listenForDreamingLockscreenHostedToDozing() {
		scope.launch {
		combine(
		keyguardInteractor.dozeTransitionModel,
		transitionInteractor.startedKeyguardTransitionStep,
		::Pair
		)
		combine(keyguardInteractor.dozeTransitionModel, startedKeyguardTransitionStep, ::Pair)
		.collect { (dozeTransitionModel, lastStartedTransitionStep) ->
		if (
		dozeTransitionModel.to == DozeStateModel.DOZE &&

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

+14 −10

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@ package com.android.systemui.keyguard.domain.interactor
		import android.animation.ValueAnimator
		import com.android.app.animation.Interpolators
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.BiometricUnlockModel
		import com.android.systemui.keyguard.shared.model.DozeStateModel
		@@ -28,6 +29,7 @@ import com.android.systemui.util.kotlin.Utils.Companion.toTriple
		import com.android.systemui.util.kotlin.sample
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.launch
		@@ -37,12 +39,17 @@ class FromDreamingTransitionInteractor
		@Inject
		constructor(
		override val transitionRepository: KeyguardTransitionRepository,
		override val transitionInteractor: KeyguardTransitionInteractor,
		@Application private val scope: CoroutineScope,
		transitionInteractor: KeyguardTransitionInteractor,
		@Background private val scope: CoroutineScope,
		@Background bgDispatcher: CoroutineDispatcher,
		@Main mainDispatcher: CoroutineDispatcher,
		private val keyguardInteractor: KeyguardInteractor,
		) :
		TransitionInteractor(
		fromState = KeyguardState.DREAMING,
		transitionInteractor = transitionInteractor,
		mainDispatcher = mainDispatcher,
		bgDispatcher = bgDispatcher,
		) {

		override fun start() {
		@@ -66,7 +73,7 @@ constructor(
		private fun listenForDreamingToOccluded() {
		scope.launch {
		combine(keyguardInteractor.isKeyguardOccluded, keyguardInteractor.isDreaming, ::Pair)
		.sample(transitionInteractor.startedKeyguardTransitionStep, ::toTriple)
		.sample(startedKeyguardTransitionStep, ::toTriple)
		.collect { (isOccluded, isDreaming, lastStartedTransition) ->
		if (
		isOccluded &&
		@@ -82,7 +89,7 @@ constructor(
		private fun listenForDreamingToGone() {
		scope.launch {
		keyguardInteractor.biometricUnlockState
		.sample(transitionInteractor.startedKeyguardTransitionStep, ::Pair)
		.sample(startedKeyguardTransitionStep, ::Pair)
		.collect { (biometricUnlockState, lastStartedTransitionStep) ->
		if (
		lastStartedTransitionStep.to == KeyguardState.DREAMING &&
		@@ -96,11 +103,7 @@ constructor(

		private fun listenForDreamingToAodOrDozing() {
		scope.launch {
		combine(
		keyguardInteractor.dozeTransitionModel,
		transitionInteractor.finishedKeyguardState,
		::Pair
		)
		combine(keyguardInteractor.dozeTransitionModel, finishedKeyguardState, ::Pair)
		.collect { (dozeTransitionModel, keyguardState) ->
		if (keyguardState == KeyguardState.DREAMING) {
		if (dozeTransitionModel.to == DozeStateModel.DOZE) {
		@@ -123,6 +126,7 @@ constructor(
		}

		companion object {
		const val TAG = "FromDreamingTransitionInteractor"
		private val DEFAULT_DURATION = 500.milliseconds
		val TO_LOCKSCREEN_DURATION = 1167.milliseconds
		}