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

Commit 88cfc311 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Add resume action button for new layout 

Fixes: 220052049
Test: manual, atest MediaDataManagerTest

Change-Id: I5018fc3ed772f3b1b80402968d96fc4d7333c613
Merged-In: I5018fc3ed772f3b1b80402968d96fc4d7333c613
(cherry picked from commit 3a67d164)
parent 4d897c6a

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

+3 −1
Original line number Diff line number Diff line
@@ -531,7 +531,8 @@ class MediaDataManager( 
        foregroundExecutor.execute {

            onMediaDataLoaded(packageName, null, MediaData(userId, true, bgColor, appName,

                    null, desc.subtitle, desc.title, artworkIcon, listOf(mediaAction), listOf(0),

                    null, packageName, token, appIntent, device = null, active = false,

                    MediaButton(playOrPause = mediaAction), packageName, token, appIntent,

                    device = null, active = false,

                    resumeAction = resumeAction, resumption = true, notificationKey = packageName,

                    hasCheckedForResume = true, lastActive = lastActive))

        }
@@ -951,6 +952,7 @@ class MediaDataManager( 
            // Move to resume key (aka package name) if that key doesn't already exist.

            val resumeAction = getResumeMediaAction(removed.resumeAction!!)

            val updated = removed.copy(token = null, actions = listOf(resumeAction),

                    semanticActions = MediaButton(playOrPause = resumeAction),

                    actionsToShowInCompact = listOf(0), active = false, resumption = true,

                    isPlaying = false, isClearable = true)

            val pkg = removed.packageName

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

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ class MediaDataManagerTest : SysuiTestCase() { 
        assertThat(data.song).isEqualTo(SESSION_TITLE)

        assertThat(data.app).isEqualTo(APP_NAME)

        assertThat(data.actions).hasSize(1)

        assertThat(data.semanticActions!!.playOrPause).isNotNull()

        assertThat(data.lastActive).isAtLeast(currentTime)

    }