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

Commit b2edafef authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

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

Change-Id: Icf7752b385f3438d43c281fa81381d4a58cf90ca
parents 226eebb1 8032fd3d
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -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,