Merge "Fixing Y translation of media when no media is visible in previousLocation" into tm-qpr-dev (21c45b5c) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -317,13 +317,16 @@ constructor(

		/**
		* Returns the amount of translationY of the media container, during the current guided
		* transformation, if running. If there is no guided transformation running, it will return 0.
		* transformation, if running. If there is no guided transformation running, it will return -1.
		*/
		fun getGuidedTransformationTranslationY(): Int {
		if (!isCurrentlyInGuidedTransformation()) {
		return -1
		}
		val startHost = getHost(previousLocation) ?: return 0
		val startHost = getHost(previousLocation)
		if (startHost == null \|\| !startHost.visible) {
		return 0
		}
		return targetBounds.top - startHost.currentBounds.top
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -388,6 +388,15 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
		.isEqualTo(expectedTranslation)
		}

		@Test
		fun getGuidedTransformationTranslationY_previousHostInvisible_returnsZero() {
		goToLockscreen()
		enterGuidedTransformation()
		whenever(lockHost.visible).thenReturn(false)

		assertThat(mediaHierarchyManager.getGuidedTransformationTranslationY()).isEqualTo(0)
		}

		@Test
		fun isCurrentlyInGuidedTransformation_hostsVisible_returnsTrue() {
		goToLockscreen()