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

Commit c326b5be authored by Julia Tuttle's avatar Julia Tuttle Committed by Ioana Alexandru
Browse files

[AOD RONs] Update small icon bg and padding for app icons 

Bug: 402147021
Flag: android.app.ui_rich_ongoing
Test: manual
Change-Id: Ic53bbd6ab1db7f1add7bf20f1d94e144844745df
parent 2881e73c

packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/AODPromotedNotification.kt

+36 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Flags.notificationsRedesignTemplates 
import android.app.Notification

import android.content.Context

import android.graphics.PorterDuff

import android.graphics.Rect

import android.graphics.drawable.Drawable

import android.util.Log

import android.view.LayoutInflater
@@ -304,6 +305,10 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
                0

            }



    private data class SmallIconSavedState(val background: Drawable?, val padding: Rect)



    private var smallIconSavedState: SmallIconSavedState? = null



    init {

        // Hide views that are never visible in the skeleton promoted notification.

        alternateExpandTarget?.visibility = GONE
@@ -555,10 +560,10 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
    ) {

        smallIconView ?: return



        // TODO: set/clear padding, background, etc. depending on icon type.



        when (notifIcon) {

            is PromotedNotificationContentModel.NotifIcon.SmallIcon -> {

                restoreNotifIconState(smallIconView)



                // Icon binding must be called in this order

                updateImageView(smallIconView, notifIcon.imageModel)

                smallIconView.setImageLevel(iconLevel)
@@ -567,6 +572,9 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
            }



            is PromotedNotificationContentModel.NotifIcon.AppIcon -> {

                saveNotifIconState(smallIconView)

                resetNotifIconState(smallIconView)



                updateImageView(smallIconView, notifIcon.drawable)

            }
@@ -576,6 +584,32 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        }

    }



    private fun saveNotifIconState(smallIconView: CachingIconView) {

        smallIconSavedState == null || return



        smallIconSavedState =

            smallIconView.let {

                SmallIconSavedState(

                    background = it.background,

                    padding = Rect(it.paddingLeft, it.paddingTop, it.paddingRight, it.paddingBottom),

                )

            }

    }



    private fun resetNotifIconState(smallIconView: CachingIconView) {

        smallIconView.background = null

        smallIconView.setPadding(0, 0, 0, 0)

    }



    private fun restoreNotifIconState(smallIconView: CachingIconView) {

        val savedState = smallIconSavedState ?: return



        smallIconView.background = savedState.background

        savedState.padding.let { smallIconView.setPadding(it.left, it.top, it.right, it.bottom) }



        smallIconSavedState = null

    }



    private fun inflateChronometer() {

        if (chronometer != null) {

            return