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>
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user