Merge changes from topic "mpietal_scrimcontroller" into main (0fbfe6f6) · Commits · e / os / android_frameworks_base

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

+0 −185

Original line number	Diff line number	Diff line
		@@ -118,9 +118,6 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest
		private val fromPrimaryBouncerTransitionInteractor by lazy {
		kosmos.fromPrimaryBouncerTransitionInteractor
		}
		private val fromDreamingLockscreenHostedTransitionInteractor by lazy {
		kosmos.fromDreamingLockscreenHostedTransitionInteractor
		}
		private val fromGlanceableHubTransitionInteractor by lazy {
		kosmos.fromGlanceableHubTransitionInteractor
		}
		@@ -161,7 +158,6 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest
		fromLockscreenTransitionInteractor.start()
		fromPrimaryBouncerTransitionInteractor.start()
		fromDreamingTransitionInteractor.start()
		fromDreamingLockscreenHostedTransitionInteractor.start()
		fromAodTransitionInteractor.start()
		fromGoneTransitionInteractor.start()
		fromDozingTransitionInteractor.start()
		@@ -274,36 +270,6 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest
		coroutineContext.cancelChildren()
		}

		@Test
		@BrokenWithSceneContainer(339465026)
		fun lockscreenToDreamingLockscreenHosted() =
		testScope.runTest {
		// GIVEN a device that is not dreaming or dozing
		keyguardRepository.setDreamingWithOverlay(false)
		keyguardRepository.setDozeTransitionModel(
		DozeTransitionModel(from = DozeStateModel.DOZE, to = DozeStateModel.FINISH)
		)
		advanceTimeBy(600L)

		// GIVEN a prior transition has run to LOCKSCREEN
		runTransitionAndSetWakefulness(KeyguardState.GONE, KeyguardState.LOCKSCREEN)

		// WHEN the device begins to dream and the dream is lockscreen hosted
		keyguardRepository.setDreamingWithOverlay(true)
		keyguardRepository.setIsActiveDreamLockscreenHosted(true)
		advanceTimeBy(100L)

		assertThat(transitionRepository)
		.startedTransition(
		to = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		from = KeyguardState.LOCKSCREEN,
		ownerName = "FromLockscreenTransitionInteractor",
		animatorAssertion = { it.isNotNull() },
		)

		coroutineContext.cancelChildren()
		}

		@Test
		fun lockscreenToDozing() =
		testScope.runTest {
		@@ -354,157 +320,6 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest
		coroutineContext.cancelChildren()
		}

		@Test
		@DisableSceneContainer
		fun dreamingLockscreenHostedToLockscreen() =
		testScope.runTest {
		// GIVEN a device dreaming with the lockscreen hosted dream and not dozing
		keyguardRepository.setIsActiveDreamLockscreenHosted(true)
		keyguardRepository.setDozeTransitionModel(
		DozeTransitionModel(from = DozeStateModel.DOZE, to = DozeStateModel.FINISH)
		)
		runCurrent()

		// GIVEN a prior transition has run to DREAMING_LOCKSCREEN_HOSTED
		runTransitionAndSetWakefulness(
		KeyguardState.GONE,
		KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		)

		// WHEN the lockscreen hosted dream stops
		keyguardRepository.setIsActiveDreamLockscreenHosted(false)
		advanceTimeBy(100L)

		assertThat(transitionRepository)
		.startedTransition(
		to = KeyguardState.LOCKSCREEN,
		from = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		ownerName = "FromDreamingLockscreenHostedTransitionInteractor",
		animatorAssertion = { it.isNotNull() },
		)

		coroutineContext.cancelChildren()
		}

		@Test
		@DisableSceneContainer
		fun dreamingLockscreenHostedToGone() =
		testScope.runTest {
		// GIVEN a prior transition has run to DREAMING_LOCKSCREEN_HOSTED
		runTransitionAndSetWakefulness(
		KeyguardState.GONE,
		KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		)

		// WHEN biometrics succeeds with wake and unlock from dream mode
		keyguardRepository.setBiometricUnlockState(
		BiometricUnlockMode.WAKE_AND_UNLOCK_FROM_DREAM
		)
		runCurrent()

		assertThat(transitionRepository)
		.startedTransition(
		to = KeyguardState.GONE,
		from = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		ownerName = "FromDreamingLockscreenHostedTransitionInteractor",
		animatorAssertion = { it.isNotNull() },
		)

		coroutineContext.cancelChildren()
		}

		@Test
		@DisableSceneContainer
		fun dreamingLockscreenHostedToPrimaryBouncer() =
		testScope.runTest {
		// GIVEN a device dreaming with lockscreen hosted dream and not dozing
		keyguardRepository.setIsActiveDreamLockscreenHosted(true)
		runCurrent()

		// GIVEN a prior transition has run to DREAMING_LOCKSCREEN_HOSTED
		runTransitionAndSetWakefulness(
		KeyguardState.GONE,
		KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		)

		// WHEN the primary bouncer is set to show
		bouncerRepository.setPrimaryShow(true)
		runCurrent()

		assertThat(transitionRepository)
		.startedTransition(
		to = KeyguardState.PRIMARY_BOUNCER,
		from = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		ownerName = "FromDreamingLockscreenHostedTransitionInteractor",
		animatorAssertion = { it.isNotNull() },
		)

		coroutineContext.cancelChildren()
		}

		@Test
		@DisableSceneContainer
		fun dreamingLockscreenHostedToDozing() =
		testScope.runTest {
		// GIVEN a device is dreaming with lockscreen hosted dream
		keyguardRepository.setIsActiveDreamLockscreenHosted(true)
		runCurrent()

		// GIVEN a prior transition has run to DREAMING_LOCKSCREEN_HOSTED
		runTransitionAndSetWakefulness(
		KeyguardState.GONE,
		KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		)

		// WHEN the device begins to sleep
		keyguardRepository.setIsActiveDreamLockscreenHosted(false)
		keyguardRepository.setDozeTransitionModel(
		DozeTransitionModel(from = DozeStateModel.INITIALIZED, to = DozeStateModel.DOZE)
		)
		runCurrent()

		assertThat(transitionRepository)
		.startedTransition(
		to = KeyguardState.DOZING,
		from = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		ownerName = "FromDreamingLockscreenHostedTransitionInteractor",
		animatorAssertion = { it.isNotNull() },
		)

		coroutineContext.cancelChildren()
		}

		@Test
		@DisableSceneContainer
		fun dreamingLockscreenHostedToOccluded() =
		testScope.runTest {
		// GIVEN device is dreaming with lockscreen hosted dream and not occluded
		keyguardRepository.setIsActiveDreamLockscreenHosted(true)
		keyguardRepository.setKeyguardOccluded(false)
		runCurrent()

		// GIVEN a prior transition has run to DREAMING_LOCKSCREEN_HOSTED
		runTransitionAndSetWakefulness(
		KeyguardState.GONE,
		KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		)

		// WHEN the keyguard is occluded and the lockscreen hosted dream stops
		keyguardRepository.setIsActiveDreamLockscreenHosted(false)
		keyguardRepository.setKeyguardOccluded(true)
		runCurrent()

		assertThat(transitionRepository)
		.startedTransition(
		to = KeyguardState.OCCLUDED,
		from = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		ownerName = "FromDreamingLockscreenHostedTransitionInteractor",
		animatorAssertion = { it.isNotNull() },
		)

		coroutineContext.cancelChildren()
		}

		@Test
		fun dozingToLockscreen() =
		testScope.runTest {

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -108,7 +108,6 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac
		import com.android.systemui.keyguard.domain.interactor.NaturalScrollingSettingObserver;
		import com.android.systemui.keyguard.ui.view.KeyguardRootView;
		import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel;
		import com.android.systemui.keyguard.ui.viewmodel.GoneToDreamingLockscreenHostedTransitionViewModel;
		import com.android.systemui.keyguard.ui.viewmodel.GoneToDreamingTransitionViewModel;
		import com.android.systemui.keyguard.ui.viewmodel.KeyguardBottomAreaViewModel;
		import com.android.systemui.keyguard.ui.viewmodel.KeyguardTouchHandlingViewModel;
		@@ -328,8 +327,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		@Mock protected LockscreenToOccludedTransitionViewModel
		mLockscreenToOccludedTransitionViewModel;
		@Mock protected GoneToDreamingTransitionViewModel mGoneToDreamingTransitionViewModel;
		@Mock protected GoneToDreamingLockscreenHostedTransitionViewModel
		mGoneToDreamingLockscreenHostedTransitionViewModel;
		@Mock protected PrimaryBouncerToGoneTransitionViewModel
		mPrimaryBouncerToGoneTransitionViewModel;
		@Mock protected KeyguardTransitionInteractor mKeyguardTransitionInteractor;
		@@ -587,10 +584,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		when(mGoneToDreamingTransitionViewModel.lockscreenTranslationY(anyInt()))
		.thenReturn(emptyFlow());

		// Gone->Dreaming lockscreen hosted
		when(mGoneToDreamingLockscreenHostedTransitionViewModel.getLockscreenAlpha())
		.thenReturn(emptyFlow());

		// Lockscreen->Occluded
		when(mLockscreenToOccludedTransitionViewModel.getLockscreenAlpha())
		.thenReturn(emptyFlow());
		@@ -752,7 +745,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		mOccludedToLockscreenTransitionViewModel,
		mLockscreenToDreamingTransitionViewModel,
		mGoneToDreamingTransitionViewModel,
		mGoneToDreamingLockscreenHostedTransitionViewModel,
		mLockscreenToOccludedTransitionViewModel,
		mPrimaryBouncerToGoneTransitionViewModel,
		mMainDispatcher,

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import com.android.systemui.shortcut.ShortcutKeyDispatcher
		import com.android.systemui.statusbar.ImmersiveModeConfirmation
		import com.android.systemui.statusbar.gesture.GesturePointerEventListener
		import com.android.systemui.statusbar.notification.InstantAppNotifier
		import com.android.systemui.statusbar.phone.ScrimController
		import com.android.systemui.statusbar.phone.StatusBarHeadsUpChangeListener
		import com.android.systemui.statusbar.policy.BatteryControllerStartable
		import com.android.systemui.stylus.StylusUsiPowerStartable
		@@ -286,11 +285,6 @@ abstract class SystemUICoreStartableModule {
		@ClassKey(KeyguardViewConfigurator::class)
		abstract fun bindKeyguardViewConfigurator(impl: KeyguardViewConfigurator): CoreStartable

		@Binds
		@IntoMap
		@ClassKey(ScrimController::class)
		abstract fun bindScrimController(impl: ScrimController): CoreStartable

		@Binds
		@IntoMap
		@ClassKey(StatusBarHeadsUpChangeListener::class)

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

deleted100644 → 0

+0 −138

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/

		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.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		import com.android.systemui.keyguard.shared.model.BiometricUnlockMode
		import com.android.systemui.keyguard.shared.model.DozeStateModel
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.power.domain.interactor.PowerInteractor
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		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.onEach
		import kotlinx.coroutines.launch

		@SysUISingleton
		class FromDreamingLockscreenHostedTransitionInteractor
		@Inject
		constructor(
		override val transitionRepository: KeyguardTransitionRepository,
		override val internalTransitionInteractor: InternalKeyguardTransitionInteractor,
		transitionInteractor: KeyguardTransitionInteractor,
		@Background private val scope: CoroutineScope,
		@Background bgDispatcher: CoroutineDispatcher,
		@Main mainDispatcher: CoroutineDispatcher,
		keyguardInteractor: KeyguardInteractor,
		powerInteractor: PowerInteractor,
		keyguardOcclusionInteractor: KeyguardOcclusionInteractor,
		) :
		TransitionInteractor(
		fromState = KeyguardState.DREAMING_LOCKSCREEN_HOSTED,
		transitionInteractor = transitionInteractor,
		mainDispatcher = mainDispatcher,
		bgDispatcher = bgDispatcher,
		powerInteractor = powerInteractor,
		keyguardOcclusionInteractor = keyguardOcclusionInteractor,
		keyguardInteractor = keyguardInteractor,
		) {

		override fun start() {
		if (SceneContainerFlag.isEnabled) return
		listenForDreamingLockscreenHostedToLockscreen()
		listenForDreamingLockscreenHostedToGone()
		listenForDreamingLockscreenHostedToDozing()
		listenForDreamingLockscreenHostedToOccluded()
		listenForDreamingLockscreenHostedToPrimaryBouncer()
		}

		private fun listenForDreamingLockscreenHostedToLockscreen() {
		scope.launch {
		keyguardInteractor.isActiveDreamLockscreenHosted
		// Add a slight delay to prevent transitioning to lockscreen from happening too soon
		// as dozing can arrive in a slight gap after the lockscreen hosted dream stops.
		.onEach { delay(50) }
		.sample(keyguardInteractor.dozeTransitionModel, ::Pair)
		.filterRelevantKeyguardStateAnd {
		(isActiveDreamLockscreenHosted, dozeTransitionModel) ->
		!isActiveDreamLockscreenHosted &&
		DozeStateModel.isDozeOff(dozeTransitionModel.to)
		}
		.collect { startTransitionTo(KeyguardState.LOCKSCREEN) }
		}
		}

		private fun listenForDreamingLockscreenHostedToOccluded() {
		scope.launch {
		keyguardInteractor.isActiveDreamLockscreenHosted
		.sample(keyguardInteractor.isKeyguardOccluded, ::Pair)
		.filterRelevantKeyguardStateAnd { (isActiveDreamLockscreenHosted, isOccluded) ->
		isOccluded && !isActiveDreamLockscreenHosted
		}
		.collect { startTransitionTo(KeyguardState.OCCLUDED) }
		}
		}

		private fun listenForDreamingLockscreenHostedToPrimaryBouncer() {
		scope.launch {
		keyguardInteractor.primaryBouncerShowing
		.filterRelevantKeyguardStateAnd { isBouncerShowing -> isBouncerShowing }
		.collect { startTransitionTo(KeyguardState.PRIMARY_BOUNCER) }
		}
		}

		private fun listenForDreamingLockscreenHostedToGone() {
		scope.launch {
		keyguardInteractor.biometricUnlockState
		.filterRelevantKeyguardStateAnd { biometricUnlockState ->
		biometricUnlockState.mode == BiometricUnlockMode.WAKE_AND_UNLOCK_FROM_DREAM
		}
		.collect { startTransitionTo(KeyguardState.GONE) }
		}
		}

		private fun listenForDreamingLockscreenHostedToDozing() {
		scope.launch {
		keyguardInteractor.dozeTransitionModel
		.filterRelevantKeyguardStateAnd { it.to == DozeStateModel.DOZE }
		.collect { startTransitionTo(KeyguardState.DOZING) }
		}
		}

		override fun getDefaultAnimatorForTransitionsToState(toState: KeyguardState): ValueAnimator {
		return ValueAnimator().apply {
		interpolator = Interpolators.LINEAR
		duration =
		if (toState == KeyguardState.LOCKSCREEN) TO_LOCKSCREEN_DURATION.inWholeMilliseconds
		else DEFAULT_DURATION.inWholeMilliseconds
		}
		}

		companion object {
		private val DEFAULT_DURATION = 500.milliseconds
		val TO_LOCKSCREEN_DURATION = 1167.milliseconds
		}
		}

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

+4 −18

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ constructor(
		listenForGoneToDreaming()
		listenForGoneToLockscreenOrHubOrOccluded()
		listenForGoneToOccluded()
		listenForGoneToDreamingLockscreenHosted()
		}

		fun showKeyguard() {
		@@ -93,7 +92,7 @@ constructor(
		if (keyguardInteractor.isKeyguardOccluded.value) {
		startTransitionTo(
		KeyguardState.OCCLUDED,
		ownerReason = "Dismissible keyguard with occlusion"
		ownerReason = "Dismissible keyguard with occlusion",
		)
		}
		}
		@@ -129,7 +128,7 @@ constructor(
		KeyguardState.LOCKSCREEN,
		ownerReason =
		"Keyguard was re-enabled, and we weren't GONE when it " +
		"was originally disabled"
		"was originally disabled",
		)
		}
		}
		@@ -153,23 +152,10 @@ constructor(
		}
		}

		private fun listenForGoneToDreamingLockscreenHosted() {
		scope.launch("$TAG#listenForGoneToDreamingLockscreenHosted") {
		keyguardInteractor.isActiveDreamLockscreenHosted
		.filterRelevantKeyguardStateAnd { isActiveDreamLockscreenHosted ->
		isActiveDreamLockscreenHosted
		}
		.collect { startTransitionTo(KeyguardState.DREAMING_LOCKSCREEN_HOSTED) }
		}
		}

		private fun listenForGoneToDreaming() {
		scope.launch("$TAG#listenForGoneToDreaming") {
		keyguardInteractor.isAbleToDream
		.sample(keyguardInteractor.isActiveDreamLockscreenHosted, ::Pair)
		.filterRelevantKeyguardStateAnd { (isAbleToDream, isActiveDreamLockscreenHosted) ->
		isAbleToDream && !isActiveDreamLockscreenHosted
		}
		.filterRelevantKeyguardStateAnd { isAbleToDream -> isAbleToDream }
		.collect { startTransitionTo(KeyguardState.DREAMING) }
		}
		}
		@@ -177,7 +163,7 @@ constructor(
		private fun listenForGoneToAodOrDozing() {
		scope.launch("$TAG#listenForGoneToAodOrDozing") {
		listenForSleepTransition(
		modeOnCanceledFromStartedStep = { TransitionModeOnCanceled.RESET },
		modeOnCanceledFromStartedStep = { TransitionModeOnCanceled.RESET }
		)
		}
		}