Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a46a0105 authored May 09, 2023 by Beverly Tai Committed by Automerger Merge Worker May 09, 2023

Merge "Move toTriple/Quad/Quint methods to a Utils class" into udc-dev am:...

Merge "Move toTriple/Quad/Quint methods to a Utils class" into udc-dev am: c8abb1e0 am: 49221131

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23087236

Change-Id: Ie22689341451a58c781c6133a7c19f1379032e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d42bfd41 49221131

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,8 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor
	import com.android.systemui.keyguard.shared.model.KeyguardState		import com.android.systemui.keyguard.shared.model.KeyguardState
	import com.android.systemui.keyguard.shared.model.TransitionInfo		import com.android.systemui.keyguard.shared.model.TransitionInfo
	import com.android.systemui.keyguard.shared.model.WakefulnessState		import com.android.systemui.keyguard.shared.model.WakefulnessState
			import com.android.systemui.util.kotlin.Utils.Companion.toQuad
			import com.android.systemui.util.kotlin.Utils.Companion.toQuint
	import com.android.systemui.util.kotlin.sample		import com.android.systemui.util.kotlin.sample
	import javax.inject.Inject		import javax.inject.Inject
	import kotlinx.coroutines.CoroutineScope		import kotlinx.coroutines.CoroutineScope

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,13 +26,13 @@ import com.android.systemui.keyguard.shared.model.DozeStateModel
	import com.android.systemui.keyguard.shared.model.DozeStateModel.Companion.isDozeOff		import com.android.systemui.keyguard.shared.model.DozeStateModel.Companion.isDozeOff
	import com.android.systemui.keyguard.shared.model.KeyguardState		import com.android.systemui.keyguard.shared.model.KeyguardState
	import com.android.systemui.keyguard.shared.model.TransitionInfo		import com.android.systemui.keyguard.shared.model.TransitionInfo
			import com.android.systemui.util.kotlin.Utils.Companion.toTriple
	import com.android.systemui.util.kotlin.sample		import com.android.systemui.util.kotlin.sample
	import javax.inject.Inject		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.delay
	import kotlinx.coroutines.flow.collect
	import kotlinx.coroutines.flow.combine		import kotlinx.coroutines.flow.combine
	import kotlinx.coroutines.flow.onEach		import kotlinx.coroutines.flow.onEach
	import kotlinx.coroutines.launch		import kotlinx.coroutines.launch

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor
	import com.android.systemui.keyguard.shared.model.KeyguardState		import com.android.systemui.keyguard.shared.model.KeyguardState
	import com.android.systemui.keyguard.shared.model.TransitionInfo		import com.android.systemui.keyguard.shared.model.TransitionInfo
	import com.android.systemui.keyguard.shared.model.WakefulnessState		import com.android.systemui.keyguard.shared.model.WakefulnessState
			import com.android.systemui.util.kotlin.Utils.Companion.toTriple
	import com.android.systemui.util.kotlin.sample		import com.android.systemui.util.kotlin.sample
	import javax.inject.Inject		import javax.inject.Inject
	import kotlin.time.Duration		import kotlin.time.Duration

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,8 @@ import com.android.systemui.keyguard.shared.model.TransitionInfo
	import com.android.systemui.keyguard.shared.model.TransitionState		import com.android.systemui.keyguard.shared.model.TransitionState
	import com.android.systemui.keyguard.shared.model.WakefulnessState		import com.android.systemui.keyguard.shared.model.WakefulnessState
	import com.android.systemui.shade.data.repository.ShadeRepository		import com.android.systemui.shade.data.repository.ShadeRepository
			import com.android.systemui.util.kotlin.Utils.Companion.toQuad
			import com.android.systemui.util.kotlin.Utils.Companion.toTriple
	import com.android.systemui.util.kotlin.sample		import com.android.systemui.util.kotlin.sample
	import java.util.UUID		import java.util.UUID
	import javax.inject.Inject		import javax.inject.Inject
	@@ -144,7 +146,7 @@ constructor(
	keyguardTransitionInteractor.startedKeyguardTransitionStep,		keyguardTransitionInteractor.startedKeyguardTransitionStep,
	keyguardInteractor.statusBarState,		keyguardInteractor.statusBarState,
	keyguardInteractor.isKeyguardUnlocked,		keyguardInteractor.isKeyguardUnlocked,
	::toTriple		::Triple
	),		),
	::toQuad		::toQuad
	)		)

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,12 +24,12 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor
	import com.android.systemui.keyguard.shared.model.KeyguardState		import com.android.systemui.keyguard.shared.model.KeyguardState
	import com.android.systemui.keyguard.shared.model.TransitionInfo		import com.android.systemui.keyguard.shared.model.TransitionInfo
	import com.android.systemui.keyguard.shared.model.WakefulnessState		import com.android.systemui.keyguard.shared.model.WakefulnessState
			import com.android.systemui.util.kotlin.Utils.Companion.toTriple
	import com.android.systemui.util.kotlin.sample		import com.android.systemui.util.kotlin.sample
	import javax.inject.Inject		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.flow.collect
	import kotlinx.coroutines.flow.combine		import kotlinx.coroutines.flow.combine
	import kotlinx.coroutines.launch		import kotlinx.coroutines.launch