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

Commit 915e6720 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[AOD RONs] Add support for different scale large icons 

Fix: 406779921
Test: manually tested a bunch of cases: with and without large icon,
with long title, with long text, with long subtext, with different
aspect ratios
Flag: android.app.ui_rich_ongoing

Change-Id: I8b53553a0c9fcc3065b106e5ef1c8b420f9e7c42
parent 5156a247

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

+51 −33
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.PorterDuff 
import android.graphics.Rect

import android.graphics.drawable.Drawable

import android.util.Log

import android.util.Size

import android.view.LayoutInflater

import android.view.NotificationTopLineView

import android.view.View
@@ -77,6 +78,7 @@ import com.android.systemui.statusbar.notification.promoted.shared.model.Promote 
import com.android.systemui.statusbar.notification.promoted.ui.viewmodel.AODPromotedNotificationViewModel

import com.android.systemui.statusbar.notification.row.shared.ImageModel

import com.android.systemui.statusbar.notification.row.shared.isNullOrEmpty

import kotlin.math.min



@Composable

fun AODPromotedNotification(
@@ -291,7 +293,7 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
    private var oldProgressBar: ProgressBar? = null

    private val newProgressBar = root.findViewById<View>(R.id.progress) as? NotificationProgressBar



    private val largeIconSizePx: Int =

    private val defaultLargeIconSizePx: Int =

        root.context.resources.getDimensionPixelSize(R.dimen.notification_right_icon_size)



    private val marginPx: Int =
@@ -303,17 +305,6 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
            )

        }



    private val imageEndMarginPx: Int

        get() = largeIconSizePx + 2 * marginPx



    private val PromotedNotificationContentModel.imageEndMarginPxIfHasLargeIcon: Int

        get() =

            if (!skeletonLargeIcon.isNullOrEmpty()) {

                imageEndMarginPx

            } else {

                marginPx

            }



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



    private var smallIconSavedState: SmallIconSavedState? = null
@@ -335,15 +326,6 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
            ?.mutate()

            ?.setColorFilter(SecondaryText.colorInt, PorterDuff.Mode.SRC_IN)



        rightIcon?.setRightIconState(

            width = largeIconSizePx,

            height = largeIconSizePx,

            marginEnd = marginPx,

        )



        bigText?.setImageEndMargin(largeIconSizePx + marginPx)

        text?.setImageEndMargin(largeIconSizePx + marginPx)



        setTextViewColor(appNameDivider, SecondaryText)

        setTextViewColor(headerTextDivider, SecondaryText)

        setTextViewColor(headerTextSecondaryDivider, SecondaryText)
@@ -389,7 +371,7 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        }

        updateText(textView, content)

        updateNotifIcon(icon, content.skeletonNotifIcon, content.iconLevel)

        updateImageView(rightIcon, content.skeletonLargeIcon)

        updateRightIconAndSpacing(content.skeletonLargeIcon)

        updateOldProgressBar(content)

    }
@@ -463,8 +445,6 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        updateProfileBadge(content)



        updateHeaderDividers(content, hideTitle = !hasTitle, hideAppName = hideAppName)



        updateTopLine(content)

    }



    private fun updateHeaderDividers(
@@ -503,7 +483,6 @@ private class AODPromotedNotificationViewUpdater(root: View) { 


        updateConversationHeaderDividers(content, hideTitle = true, hideAppName = collapsed)



        updateTopLine(content)

        updateConversationIcon(content)

        updateTitle(conversationText, content)

    }
@@ -545,10 +524,6 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
    }



    private fun updateTitle(titleView: TextView?, content: PromotedNotificationContentModel) {

        (titleView?.layoutParams as? MarginLayoutParams)?.let {

            it.marginEnd = content.imageEndMarginPxIfHasLargeIcon

            titleView.layoutParams = it

        }

        updateTextView(titleView, content.title, color = PrimaryText)

    }
@@ -573,6 +548,48 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        chronometer?.isVisible = (content.time is When.Chronometer)

    }



    private fun updateRightIconAndSpacing(image: ImageModel?) {

        updateImageView(rightIcon, image)



        val rightIconSizePx = calculateRightIconDimensions(image?.drawable)

        rightIcon?.setRightIconState(

            width = rightIconSizePx.width,

            height = rightIconSizePx.height,

            marginEnd = marginPx,

        )



        bigText?.setImageEndMargin(rightIconSizePx.width)

        text?.setImageEndMargin(rightIconSizePx.width)



        val hasRightIcon = image?.drawable != null

        val spaceBasedOnRightIcon =

            if (hasRightIcon) rightIconSizePx.width + 2 * marginPx else marginPx

        (title?.layoutParams as? MarginLayoutParams)?.let {

            it.marginEnd = spaceBasedOnRightIcon

            title.layoutParams = it

        }

        topLine?.headerTextMarginEnd = spaceBasedOnRightIcon

    }



    private fun calculateRightIconDimensions(drawable: Drawable?): Size {

        var viewWidthPx = defaultLargeIconSizePx

        val viewHeightPx = defaultLargeIconSizePx



        drawable?.let {

            val iconWidth = drawable.intrinsicWidth

            val iconHeight = drawable.intrinsicHeight



            if (iconWidth > 0 && iconHeight > 0) {

                if (iconWidth > iconHeight) {

                    val maxViewWidthPx = viewHeightPx * MAX_LARGE_ICON_ASPECT_RATIO

                    viewWidthPx = (viewHeightPx.toFloat() * iconWidth / iconHeight).toInt()

                    viewWidthPx = min(viewWidthPx, maxViewWidthPx.toInt())

                }

            }

        }

        return Size(viewWidthPx, viewHeightPx)

    }



    private fun updateProfileBadge(content: PromotedNotificationContentModel) {

        if (content.profileBadgeBitmap != null) {

            profileBadge?.setImageBitmap(content.profileBadgeBitmap)
@@ -649,10 +666,6 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        chronometer?.appendFontFeatureSetting("tnum")

    }



    private fun updateTopLine(content: PromotedNotificationContentModel) {

        topLine?.headerTextMarginEnd = content.imageEndMarginPxIfHasLargeIcon

    }



    private fun inflateOldProgressBar() {

        if (oldProgressBar != null) {

            return
@@ -696,6 +709,11 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
    private fun setTextViewColor(view: TextView?, color: AodPromotedNotificationColor) {

        view?.setTextColor(color.colorInt)

    }



    companion object {

        /** Maximum aspect ratio of the large icon. 16:9 */

        private const val MAX_LARGE_ICON_ASPECT_RATIO: Float = 16f / 9f

    }

}



private fun CharSequence.toSkeleton(): CharSequence {