diff options
| author | 2022-10-17 18:01:56 +0000 | |
|---|---|---|
| committer | 2022-10-17 18:01:56 +0000 | |
| commit | 5dbcde4fbb2cb220ff3a903a0932a3363ebe3c5d (patch) | |
| tree | c1683939b212a7972c4f36028787daa8c953796d | |
| parent | 5303530ec5f80b98cd9fb4bf2188abe5a5d20b96 (diff) | |
| parent | b94584b1ca18d85b4867a35d563d4326b53bf3a5 (diff) | |
Merge "Enable testMediaLoaded_ScrollToActivePlayer" into tm-qpr-dev am: 9d567f1eb6 am: b94584b1ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20194995
Change-Id: I1852ea56d30e3f48ba1232851f87d2abe498ccaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt index f34c2ac57a5c..cc6874ba3ba7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt @@ -281,6 +281,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { verify(logger).logRecommendationRemoved(eq(packageName), eq(instanceId!!)) } + @Test fun testMediaLoaded_ScrollToActivePlayer() { listener.value.onMediaDataLoaded("playing local", null, @@ -292,8 +293,8 @@ class MediaCarouselControllerTest : SysuiTestCase() { DATA.copy(active = true, isPlaying = false, playbackLocation = MediaData.PLAYBACK_LOCAL, resumption = false)) // adding a media recommendation card. - MediaPlayerData.addMediaRecommendation(SMARTSPACE_KEY, EMPTY_SMARTSPACE_MEDIA_DATA, panel, - false, clock) + listener.value.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, EMPTY_SMARTSPACE_MEDIA_DATA, + false) mediaCarouselController.shouldScrollToActivePlayer = true // switching between media players. listener.value.onMediaDataLoaded("playing local", |