Merge "[flexiglass] Don't dim screen or go to sleep while typing a password." into main (7820d50e) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PasswordBouncer.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,7 @@ internal fun PasswordBouncer(
	LaunchedEffect(Unit) {		LaunchedEffect(Unit) {
	// When the UI comes up, request focus on the TextField to bring up the software keyboard.		// When the UI comes up, request focus on the TextField to bring up the software keyboard.
	focusRequester.requestFocus()		focusRequester.requestFocus()
	// Also, report that the UI is shown to let the view-model runs some logic.		// Also, report that the UI is shown to let the view-model run some logic.
	viewModel.onShown()		viewModel.onShown()
	}		}

packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt

+3 −0

packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt

+32 −25

Original line number	Original line	Diff line number	Diff line
	@@ -27,10 +27,10 @@ import com.android.systemui.power.shared.model.ScreenPowerState
	import com.android.systemui.power.shared.model.WakeSleepReason		import com.android.systemui.power.shared.model.WakeSleepReason
	import com.android.systemui.power.shared.model.WakefulnessState		import com.android.systemui.power.shared.model.WakefulnessState
	import com.android.systemui.statusbar.phone.ScreenOffAnimationController		import com.android.systemui.statusbar.phone.ScreenOffAnimationController
			import javax.inject.Inject
	import kotlinx.coroutines.flow.Flow		import kotlinx.coroutines.flow.Flow
	import kotlinx.coroutines.flow.distinctUntilChanged		import kotlinx.coroutines.flow.distinctUntilChanged
	import kotlinx.coroutines.flow.map		import kotlinx.coroutines.flow.map
	import javax.inject.Inject

	/** Hosts business logic for interacting with the power system. */		/** Hosts business logic for interacting with the power system. */
	@SysUISingleton		@SysUISingleton
	@@ -59,17 +59,27 @@ constructor(
	* Whether we're awake (screen is on and responding to user touch) or asleep (screen is off, or		* Whether we're awake (screen is on and responding to user touch) or asleep (screen is off, or
	* on AOD).		* on AOD).
	*/		*/
	val isAwake = repository.wakefulness		val isAwake =
			repository.wakefulness
	.map { it.isAwake() }		.map { it.isAwake() }
	.distinctUntilChanged(checkEquivalentUnlessEmitDuplicatesUnderTest)		.distinctUntilChanged(checkEquivalentUnlessEmitDuplicatesUnderTest)

	/**		/** Helper flow in case "isAsleep" reads better than "!isAwake". */
	* Helper flow in case "isAsleep" reads better than "!isAwake".
	*/
	val isAsleep = isAwake.map { !it }		val isAsleep = isAwake.map { !it }

	val screenPowerState = repository.screenPowerState		val screenPowerState = repository.screenPowerState

			/**
			* Notifies the power interactor that a user touch happened.
			*
			* @param noChangeLights If true, does not cause the keyboard backlight to turn on because of
			* this event. This is set when the power key is pressed. We want the device to stay on while
			* the button is down, but we're about to turn off the screen so we don't want the keyboard
			* backlight to turn on again. Otherwise the lights flash on and then off and it looks weird.
			*/
			fun onUserTouch(noChangeLights: Boolean = false) =
			repository.userTouch(noChangeLights = noChangeLights)

	/**		/**
	* Wakes up the device if the device was dozing.		* Wakes up the device if the device was dozing.
	*		*
	@@ -92,9 +102,7 @@ constructor(
	*/		*/
	fun wakeUpForFullScreenIntent() {		fun wakeUpForFullScreenIntent() {
	if (repository.wakefulness.value.isAsleep() \|\| statusBarStateController.isDozing) {		if (repository.wakefulness.value.isAsleep() \|\| statusBarStateController.isDozing) {
	repository.wakeUp(		repository.wakeUp(why = FSI_WAKE_WHY, wakeReason = PowerManager.WAKE_REASON_APPLICATION)
	why = FSI_WAKE_WHY,
	wakeReason = PowerManager.WAKE_REASON_APPLICATION)
	}		}
	}		}

	@@ -258,8 +266,7 @@ constructor(
	*/		*/
	@JvmOverloads		@JvmOverloads
	fun PowerInteractor.setAsleepForTest(		fun PowerInteractor.setAsleepForTest(
	@PowerManager.GoToSleepReason sleepReason: Int =		@PowerManager.GoToSleepReason sleepReason: Int = PowerManager.GO_TO_SLEEP_REASON_MIN,
	PowerManager.GO_TO_SLEEP_REASON_MIN,
	forceEmit: Boolean = false,		forceEmit: Boolean = false,
	) {		) {
	emitDuplicateWakefulnessValue = forceEmit		emitDuplicateWakefulnessValue = forceEmit

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt

+3 −3

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

	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dagger.qualifiers.Application		import com.android.systemui.dagger.qualifiers.Application
	import com.android.systemui.power.data.repository.PowerRepository		import com.android.systemui.power.domain.interactor.PowerInteractor
	import com.android.systemui.scene.data.repository.SceneContainerRepository		import com.android.systemui.scene.data.repository.SceneContainerRepository
	import com.android.systemui.scene.shared.logger.SceneLogger		import com.android.systemui.scene.shared.logger.SceneLogger
	import com.android.systemui.scene.shared.model.ObservableTransitionState		import com.android.systemui.scene.shared.model.ObservableTransitionState
	@@ -48,7 +48,7 @@ class SceneInteractor
	constructor(		constructor(
	@Application private val applicationScope: CoroutineScope,		@Application private val applicationScope: CoroutineScope,
	private val repository: SceneContainerRepository,		private val repository: SceneContainerRepository,
	private val powerRepository: PowerRepository,		private val powerInteractor: PowerInteractor,
	private val logger: SceneLogger,		private val logger: SceneLogger,
	) {		) {

	@@ -202,7 +202,7 @@ constructor(

	/** Handles a user input event. */		/** Handles a user input event. */
	fun onUserInput() {		fun onUserInput() {
	powerRepository.userTouch()		powerInteractor.onUserTouch()
	}		}

	/**		/**

packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -291,6 +291,14 @@ class BouncerInteractorTest : SysuiTestCase() {
	assertThat(imeHiddenEvent).isNotNull()		assertThat(imeHiddenEvent).isNotNull()
	}		}

			@Test
			fun intentionalUserInputEvent_registersTouchEvent() =
			testScope.runTest {
			assertThat(utils.powerRepository.userTouchRegistered).isFalse()
			underTest.onIntentionalUserInput()
			assertThat(utils.powerRepository.userTouchRegistered).isTrue()
			}

	private fun assertTryAgainMessage(		private fun assertTryAgainMessage(
	message: String?,		message: String?,
	time: Int,		time: Int,

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ import com.android.systemui.classifier.FalsingClassifier
	import com.android.systemui.classifier.domain.interactor.FalsingInteractor		import com.android.systemui.classifier.domain.interactor.FalsingInteractor
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dagger.qualifiers.Application		import com.android.systemui.dagger.qualifiers.Application
			import com.android.systemui.power.domain.interactor.PowerInteractor
	import com.android.systemui.res.R		import com.android.systemui.res.R
	import com.android.systemui.scene.shared.flag.SceneContainerFlags		import com.android.systemui.scene.shared.flag.SceneContainerFlags
	import com.android.systemui.util.kotlin.pairwise		import com.android.systemui.util.kotlin.pairwise
	@@ -52,6 +53,7 @@ constructor(
	private val authenticationInteractor: AuthenticationInteractor,		private val authenticationInteractor: AuthenticationInteractor,
	flags: SceneContainerFlags,		flags: SceneContainerFlags,
	private val falsingInteractor: FalsingInteractor,		private val falsingInteractor: FalsingInteractor,
			private val powerInteractor: PowerInteractor,
	) {		) {

	/** The user-facing message to show in the bouncer. */		/** The user-facing message to show in the bouncer. */
	@@ -128,6 +130,7 @@ constructor(
	* user's pocket or by the user's face while holding their device up to their ear.		* user's pocket or by the user's face while holding their device up to their ear.
	*/		*/
	fun onIntentionalUserInput() {		fun onIntentionalUserInput() {
			powerInteractor.onUserTouch()
	falsingInteractor.updateFalseConfidence(FalsingClassifier.Result.passed(0.6))		falsingInteractor.updateFalseConfidence(FalsingClassifier.Result.passed(0.6))
	}		}