Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing Y translation of media when no media is visible in previousLocation" into tm-qpr-dev am: 21c45b5c27

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22238584

Change-Id: I484db047507706ec50df1822a8693185b0abe6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Brzeziński
2023-03-24 20:46:01 +00:00
committed by Automerger Merge Worker
parent d3f39b4ea1 21c45b5c27
commit 9f55ec96f7
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,13 +317,16 @@ constructor(
/** /**
* Returns the amount of translationY of the media container, during the current guided * 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 { fun getGuidedTransformationTranslationY(): Int {
if (!isCurrentlyInGuidedTransformation()) { if (!isCurrentlyInGuidedTransformation()) {
return -1 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 return targetBounds.top - startHost.currentBounds.top
} }

9
packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaHierarchyManagerTest.kt
View File

@@ -388,6 +388,15 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
.isEqualTo(expectedTranslation) .isEqualTo(expectedTranslation)
} }
@Test
fun getGuidedTransformationTranslationY_previousHostInvisible_returnsZero() {
goToLockscreen()
enterGuidedTransformation()
whenever(lockHost.visible).thenReturn(false)
assertThat(mediaHierarchyManager.getGuidedTransformationTranslationY()).isEqualTo(0)
}
@Test @Test
fun isCurrentlyInGuidedTransformation_hostsVisible_returnsTrue() { fun isCurrentlyInGuidedTransformation_hostsVisible_returnsTrue() {
goToLockscreen() goToLockscreen()