Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 008a21e0 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Add lastActive to the media carousel sort comparator" into tm-dev am: c073bcee 

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



Change-Id: I704d6689f2c9f616468b324233613ff24eee22de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d70d0f0 c073bcee

packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -948,6 +948,7 @@ internal object MediaPlayerData { 
        .thenByDescending { shouldPrioritizeSs == it.isSsMediaRec }

        .thenByDescending { shouldPrioritizeSs == it.isSsMediaRec }

        .thenByDescending { !it.data.resumption }

        .thenByDescending { !it.data.resumption }

        .thenByDescending { it.data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE }

        .thenByDescending { it.data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE }

        .thenByDescending { it.data.lastActive }

        .thenByDescending { it.updateTime }

        .thenByDescending { it.updateTime }

        .thenByDescending { it.data.notificationKey }

        .thenByDescending { it.data.notificationKey }

packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt

+10 −1
Original line number Original line Diff line number Diff line
@@ -139,6 +139,15 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
                playbackLocation = MediaData.PLAYBACK_LOCAL, resumption = true),

                playbackLocation = MediaData.PLAYBACK_LOCAL, resumption = true),

            1000L)

            1000L)





        val activeMoreRecent = Triple("active more recent",

            DATA.copy(active = false, isPlaying = false,

                playbackLocation = MediaData.PLAYBACK_LOCAL, resumption = true, lastActive = 2L),

            1000L)



        val activeLessRecent = Triple("active less recent",

            DATA.copy(active = false, isPlaying = false,

                playbackLocation = MediaData.PLAYBACK_LOCAL, resumption = true, lastActive = 1L),

            1000L)

        // Expected ordering for media players:

        // Expected ordering for media players:

        // Actively playing local sessions

        // Actively playing local sessions

        // Actively playing cast sessions

        // Actively playing cast sessions