Merge "Add KeyguardTransitionInteractorFactory and update tests to use it." into udc-qpr-dev (1abfab23) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -167,9 +167,10 @@ constructor(
		from = KeyguardState.PRIMARY_BOUNCER,
		to = KeyguardState.LOCKSCREEN,
		animator =
		getDefaultAnimatorForTransitionsToState(KeyguardState.LOCKSCREEN).apply {
		duration = 0
		}
		getDefaultAnimatorForTransitionsToState(
		KeyguardState.LOCKSCREEN
		)
		.apply { duration = 0 }
		)
		)
		}

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+8 −6

Original line number	Diff line number	Diff line
		@@ -21,21 +21,22 @@ import android.view.View
		import android.widget.TextView
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository
		import com.android.systemui.broadcast.BroadcastDispatcher
		import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractorFactory
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.plugins.ClockAnimations
		import com.android.systemui.plugins.ClockController
		import com.android.systemui.plugins.ClockEvents
		import com.android.systemui.plugins.ClockFaceController
		import com.android.systemui.plugins.ClockFaceConfig
		import com.android.systemui.plugins.ClockFaceController
		import com.android.systemui.plugins.ClockFaceEvents
		import com.android.systemui.plugins.ClockTickRate
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.statusbar.policy.BatteryController
		import com.android.systemui.statusbar.policy.ConfigurationController
		@@ -64,7 +65,6 @@ import org.mockito.Mockito.verify
		import org.mockito.junit.MockitoJUnit
		import java.util.TimeZone
		import java.util.concurrent.Executor
		import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository
		import org.mockito.Mockito.`when` as whenever

		@RunWith(AndroidTestingRunner::class)
		@@ -122,7 +122,9 @@ class ClockEventControllerTest : SysuiTestCase() {
		bouncerRepository = bouncerRepository,
		configurationRepository = FakeConfigurationRepository(),
		),
		KeyguardTransitionInteractor(transitionRepository, TestScope().backgroundScope),
		KeyguardTransitionInteractorFactory.create(
		scope = TestScope().backgroundScope,
		).keyguardTransitionInteractor,
		broadcastDispatcher,
		batteryController,
		keyguardUpdateMonitor,

packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt

+6 −5

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractorFactory
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.model.TransitionState
		import com.android.systemui.keyguard.shared.model.TransitionStep
		@@ -54,10 +54,11 @@ class LogContextInteractorImplTest : SysuiTestCase() {
		LogContextInteractorImpl(
		testScope.backgroundScope,
		foldProvider,
		KeyguardTransitionInteractor(
		keyguardTransitionRepository,
		testScope.backgroundScope
		),
		KeyguardTransitionInteractorFactory.create(
		repository = keyguardTransitionRepository,
		scope = testScope.backgroundScope,
		)
		.keyguardTransitionInteractor,
		)
		}

packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt

+6 −5

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractorFactory
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.model.TransitionStep
		import com.android.systemui.keyguard.shared.model.WakeSleepReason
		@@ -67,10 +67,11 @@ class ResourceTrimmerTest : SysuiTestCase() {
		resourceTrimmer =
		ResourceTrimmer(
		keyguardInteractor,
		KeyguardTransitionInteractor(
		keyguardTransitionRepository,
		testScope.backgroundScope
		),
		KeyguardTransitionInteractorFactory.create(
		scope = TestScope().backgroundScope,
		repository = keyguardTransitionRepository,
		)
		.keyguardTransitionInteractor,
		globalWindowManager,
		testScope.backgroundScope,
		testDispatcher,

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt

+6 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractorFactory
		import com.android.systemui.keyguard.shared.model.AuthenticationStatus
		import com.android.systemui.keyguard.shared.model.DetectionStatus
		import com.android.systemui.keyguard.shared.model.ErrorAuthenticationStatus
		@@ -216,7 +216,11 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() {
		)
		keyguardTransitionRepository = FakeKeyguardTransitionRepository()
		val keyguardTransitionInteractor =
		KeyguardTransitionInteractor(keyguardTransitionRepository, testScope.backgroundScope)
		KeyguardTransitionInteractorFactory.create(
		scope = TestScope().backgroundScope,
		repository = keyguardTransitionRepository,
		)
		.keyguardTransitionInteractor
		return DeviceEntryFaceAuthRepositoryImpl(
		mContext,
		fmOverride,