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

Merge "Make sure actions have icons" into rvc-dev am: 8032fd3d0c

Browse Source 
Change-Id: Ifd9ff50e889caae926d522846dc6728b8f2060db
This commit is contained in:
Beth Thibodeau
2020-05-22 18:39:29 +00:00
committed by Automerger Merge Worker
parent 96e3c244d2 8032fd3d0c
commit 518d7d2396
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,12 +199,17 @@ class MediaDataManager @Inject constructor(
val actionIcons: MutableList<MediaAction> = ArrayList()
val actions = notif.actions
val actionsToShowCollapsed = notif.extras.getIntArray(
Notification.EXTRA_COMPACT_ACTIONS)?.toList() ?: emptyList()
Notification.EXTRA_COMPACT_ACTIONS)?.toMutableList() ?: mutableListOf<Int>()
// TODO: b/153736623 look into creating actions when this isn't a media style notification
val packageContext: Context = sbn.getPackageContext(context)
if (actions != null) {
for (action in actions) {
for ((index, action) in actions.withIndex()) {
if (action.getIcon() == null) {
Log.i(TAG, "No icon for action $index ${action.title}")
actionsToShowCollapsed.remove(index)
continue
}
val mediaAction = MediaAction(
action.getIcon().loadDrawable(packageContext),
action.actionIntent,