Merge "Move GONE transition listener to application scope" into main (11538b19) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -400,7 +400,6 @@ constructor(
		keyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback)
		mediaCarousel.repeatWhenAttached {
		repeatOnLifecycle(Lifecycle.State.STARTED) {
		listenForAnyStateToGoneKeyguardTransition(this)
		listenForAnyStateToLockscreenTransition(this)
		listenForAnyStateToDozingTransition(this)

		@@ -408,6 +407,7 @@ constructor(
		listenForMediaItemsChanges(this)
		}
		}
		listenForAnyStateToGoneKeyguardTransition(applicationScope)
		listenForLockscreenSettingChanges(applicationScope)

		// Notifies all active players about animation scale changes.

+3 −2

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ import org.mockito.ArgumentCaptor
		import org.mockito.Captor
		import org.mockito.Mock
		import org.mockito.Mockito.anyLong
		import org.mockito.Mockito.atLeast
		import org.mockito.Mockito.floatThat
		import org.mockito.Mockito.mock
		import org.mockito.Mockito.never
		@@ -613,7 +614,7 @@ class MediaCarouselControllerTest : SysuiTestCase() {
		this,
		)

		verify(mediaCarousel).visibility = View.VISIBLE
		verify(mediaCarousel, atLeast(1)).visibility = View.VISIBLE
		assertEquals(true, updatedVisibility)
		assertEquals(false, mediaCarouselController.isLockedAndHidden())

		@@ -638,7 +639,7 @@ class MediaCarouselControllerTest : SysuiTestCase() {
		kosmos.sceneInteractor.changeScene(Scenes.Gone, "")
		kosmos.setSceneTransition(Idle(Scenes.Gone))

		verify(mediaCarousel).visibility = View.VISIBLE
		verify(mediaCarousel, atLeast(1)).visibility = View.VISIBLE
		assertEquals(true, updatedVisibility)

		job.cancel()