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

Commit c8abb1e0 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

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

parents d5076267 97bdc294

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

+2 −0
Original line number 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.TransitionInfo

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 javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

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

+1 −1
Original line number 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.KeyguardState

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 javax.inject.Inject

import kotlin.time.Duration

import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.delay

import kotlinx.coroutines.flow.collect

import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.launch

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

+1 −0
Original line number 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.TransitionInfo

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 javax.inject.Inject

import kotlin.time.Duration

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

+3 −1
Original line number 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.WakefulnessState

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 java.util.UUID

import javax.inject.Inject
@@ -144,7 +146,7 @@ constructor( 
                        keyguardTransitionInteractor.startedKeyguardTransitionStep,

                        keyguardInteractor.statusBarState,

                        keyguardInteractor.isKeyguardUnlocked,

                        ::toTriple

                        ::Triple

                    ),

                    ::toQuad

                )

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

+1 −1
Original line number 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.TransitionInfo

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 javax.inject.Inject

import kotlin.time.Duration

import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.collect

import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.launch