Merge "Make QS listen when expanded over Lockscreen" into main (65e91daf) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -608,6 +608,7 @@ constructor(
		isWakingToShadeLocked = true
		}
		statusBarStateController.setState(StatusBarState.SHADE_LOCKED)
		qS?.setListening(true)
		// This call needs to be after updating the shade state since otherwise
		// the scrimstate resets too early
		if (animationHandler != null) {

+2 −3

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ import org.mockito.ArgumentMatchers.anyLong
		import org.mockito.ArgumentMatchers.eq
		import org.mockito.ArgumentMatchers.isNull
		import org.mockito.Mock
		import org.mockito.Mockito
		import org.mockito.Mockito.clearInvocations
		import org.mockito.Mockito.never
		import org.mockito.Mockito.verify
		@@ -203,6 +202,7 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() {
		testScope.runTest {
		transitionController.goToLockedShade(null)
		verify(statusbarStateController).setState(StatusBarState.SHADE_LOCKED)
		verify(qS).setListening(true)
		}

		@Test
		@@ -261,8 +261,7 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() {
		transitionController.goToLockedShade(null)
		verify(statusbarStateController, never()).setState(anyInt())
		verify(statusbarStateController).setLeaveOpenOnKeyguardHide(true)
		verify(centralSurfaces)
		.showBouncerWithDimissAndCancelIfKeyguard(nullable(), nullable())
		verify(centralSurfaces).showBouncerWithDimissAndCancelIfKeyguard(nullable(), nullable())
		}

		@Test