Merge "Do not emit dismiss alpha when QS expanded" into main (df773253) · Commits · e / os / android_frameworks_base

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

+26 −0

Original line number	Diff line number	Diff line
		@@ -381,6 +381,32 @@ class KeyguardInteractorTest : SysuiTestCase() {
		assertThat(dismissAlpha.size).isEqualTo(1)
		}

		@Test
		fun dismissAlpha_doesNotEmitWhenQsIsExpandedAndKeyguardDismissible() =
		testScope.runTest {
		val dismissAlpha by collectValues(underTest.dismissAlpha)
		assertThat(dismissAlpha[0]).isEqualTo(1f)
		assertThat(dismissAlpha.size).isEqualTo(1)

		keyguardTransitionRepository.sendTransitionSteps(from = AOD, to = LOCKSCREEN, testScope)

		// QS is fully expanded
		shadeRepository.setQsExpansion(1f)

		// User begins to swipe up when dimissible
		repository.setStatusBarState(StatusBarState.KEYGUARD)
		repository.setKeyguardDismissible(true)

		shadeRepository.setLegacyShadeExpansion(0.5f)
		runCurrent()

		shadeRepository.setLegacyShadeExpansion(0.98f)
		runCurrent()

		assertThat(dismissAlpha[0]).isEqualTo(1f)
		assertThat(dismissAlpha.size).isEqualTo(1)
		}

		@Test
		@DisableSceneContainer
		fun dismissAlpha_onGlanceableHub_doesNotEmitWhenShadeResets() =

+1 −0

Original line number	Diff line number	Diff line
		@@ -389,6 +389,7 @@ constructor(
		val currentKeyguardState = keyguardTransitionInteractor.currentKeyguardState.value
		val isKeyguardDismissible = isKeyguardDismissible.value

		if (shadeRepository.qsExpansion.value > 0f) return@transform
		if (
		statusBarState.value == StatusBarState.KEYGUARD &&
		isKeyguardDismissible &&