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

Merge "Add resume action button for new layout" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-18 21:07:44 +00:00
committed by Android (Google) Code Review
parent 769b3a4328 88cfc3112d
commit 23cbcff7a4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
View File

@@ -531,7 +531,8 @@ class MediaDataManager(
foregroundExecutor.execute { foregroundExecutor.execute {
onMediaDataLoaded(packageName, null, MediaData(userId, true, bgColor, appName, onMediaDataLoaded(packageName, null, MediaData(userId, true, bgColor, appName,
null, desc.subtitle, desc.title, artworkIcon, listOf(mediaAction), listOf(0), 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, resumeAction = resumeAction, resumption = true, notificationKey = packageName,
hasCheckedForResume = true, lastActive = lastActive)) hasCheckedForResume = true, lastActive = lastActive))
} }
@@ -951,6 +952,7 @@ class MediaDataManager(
// Move to resume key (aka package name) if that key doesn't already exist. // Move to resume key (aka package name) if that key doesn't already exist.
val resumeAction = getResumeMediaAction(removed.resumeAction!!) val resumeAction = getResumeMediaAction(removed.resumeAction!!)
val updated = removed.copy(token = null, actions = listOf(resumeAction), val updated = removed.copy(token = null, actions = listOf(resumeAction),
semanticActions = MediaButton(playOrPause = resumeAction),
actionsToShowInCompact = listOf(0), active = false, resumption = true, actionsToShowInCompact = listOf(0), active = false, resumption = true,
isPlaying = false, isClearable = true) isPlaying = false, isClearable = true)
val pkg = removed.packageName val pkg = removed.packageName

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

@@ -370,6 +370,7 @@ class MediaDataManagerTest : SysuiTestCase() {
assertThat(data.song).isEqualTo(SESSION_TITLE) assertThat(data.song).isEqualTo(SESSION_TITLE)
assertThat(data.app).isEqualTo(APP_NAME) assertThat(data.app).isEqualTo(APP_NAME)
assertThat(data.actions).hasSize(1) assertThat(data.actions).hasSize(1)
assertThat(data.semanticActions!!.playOrPause).isNotNull()
assertThat(data.lastActive).isAtLeast(currentTime) assertThat(data.lastActive).isAtLeast(currentTime)
} }