Merge "Check for block location change when configuration changes" into tm-qpr-dev (4f4d7d3a) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -639,7 +639,9 @@ constructor(
		) =
		traceSection("MediaHierarchyManager#updateDesiredLocation") {
		val desiredLocation = calculateLocation()
		if (desiredLocation != this.desiredLocation \|\| forceStateUpdate) {
		if (
		desiredLocation != this.desiredLocation \|\| forceStateUpdate && !blockLocationChanges
		) {
		if (this.desiredLocation >= 0 && desiredLocation != this.desiredLocation) {
		// Only update previous location when it actually changes
		previousLocation = this.desiredLocation

+51 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,57 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
		)
		}

		@Test
		fun testBlockedWhenConfigurationChangesAndScreenOff() {
		// Let's set it onto QS:
		mediaHierarchyManager.qsExpansion = 1.0f
		verify(mediaCarouselController)
		.onDesiredLocationChanged(
		ArgumentMatchers.anyInt(),
		any(MediaHostState::class.java),
		anyBoolean(),
		anyLong(),
		anyLong()
		)
		val observer = wakefullnessObserver.value
		assertNotNull("lifecycle observer wasn't registered", observer)
		observer.onStartedGoingToSleep()
		clearInvocations(mediaCarouselController)
		configurationController.notifyConfigurationChanged()
		verify(mediaCarouselController, times(0))
		.onDesiredLocationChanged(
		ArgumentMatchers.anyInt(),
		any(MediaHostState::class.java),
		anyBoolean(),
		anyLong(),
		anyLong()
		)
		}

		@Test
		fun testAllowedWhenConfigurationChanges() {
		// Let's set it onto QS:
		mediaHierarchyManager.qsExpansion = 1.0f
		verify(mediaCarouselController)
		.onDesiredLocationChanged(
		ArgumentMatchers.anyInt(),
		any(MediaHostState::class.java),
		anyBoolean(),
		anyLong(),
		anyLong()
		)
		clearInvocations(mediaCarouselController)
		configurationController.notifyConfigurationChanged()
		verify(mediaCarouselController)
		.onDesiredLocationChanged(
		ArgumentMatchers.anyInt(),
		any(MediaHostState::class.java),
		anyBoolean(),
		anyLong(),
		anyLong()
		)
		}

		@Test
		fun testAllowedWhenNotTurningOff() {
		// Let's set it onto QS: