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

Commit e2b73a03 authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge changes Ie1c7691d,I3d09322e into main 

* changes:
  [AOD RONs] Handle layout changes with/without large icon
  [AOD RONs] Clean up view updater a little
parents a99ba3dd 741c395a

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

+73 −38
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package com.android.systemui.statusbar.notification.promoted



import android.app.Flags

import android.app.Flags.notificationsRedesignTemplates

import android.app.Notification

import android.content.Context

import android.graphics.PorterDuff

import android.util.Log

import android.view.LayoutInflater

import android.view.NotificationTopLineView

import android.view.View

import android.view.View.GONE

import android.view.View.MeasureSpec.AT_MOST
@@ -202,7 +202,7 @@ private class FrameLayoutWithMaxHeight(maxHeight: Int, context: Context) : Frame 


private val PromotedNotificationContentModel.layoutResource: Int?

    get() {

        return if (Flags.notificationsRedesignTemplates()) {

        return if (notificationsRedesignTemplates()) {

            when (style) {

                Style.Base -> R.layout.notification_2025_template_expanded_base

                Style.BigPicture -> R.layout.notification_2025_template_expanded_big_picture
@@ -258,6 +258,7 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
    private val time: DateTimeView? = root.findViewById(R.id.time)

    private val timeDivider: TextView? = root.findViewById(R.id.time_divider)

    private val title: TextView? = root.findViewById(R.id.title)

    private val topLine: NotificationTopLineView? = root.findViewById(R.id.notification_top_line)

    private val verificationDivider: TextView? = root.findViewById(R.id.verification_divider)

    private val verificationIcon: ImageView? = root.findViewById(R.id.verification_icon)

    private val verificationText: TextView? = root.findViewById(R.id.verification_text)
@@ -266,6 +267,29 @@ 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 =

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



    private val endMarginPx: Int =

        if (notificationsRedesignTemplates()) {

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

        } else {

            root.context.resources.getDimensionPixelSize(

                systemuiR.dimen.notification_shade_content_margin_horizontal

            )

        }



    private val imageEndMarginPx: Int

        get() = largeIconSizePx + 2 * endMarginPx



    private val PromotedNotificationContentModel.imageEndMarginPxIfHasLargeIcon: Int

        get() =

            if (!skeletonLargeIcon.isNullOrEmpty()) {

                imageEndMarginPx

            } else {

                0

            }



    init {

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

        alternateExpandTarget?.visibility = GONE
@@ -283,13 +307,20 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
            ?.mutate()

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



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

            it.marginEnd = endMarginPx

            rightIcon.layoutParams = it

        }

        bigText?.setImageEndMargin(largeIconSizePx + endMarginPx)

        text?.setImageEndMargin(largeIconSizePx + endMarginPx)



        setTextViewColor(appNameDivider, SecondaryText)

        setTextViewColor(headerTextDivider, SecondaryText)

        setTextViewColor(headerTextSecondaryDivider, SecondaryText)

        setTextViewColor(timeDivider, SecondaryText)

        setTextViewColor(verificationDivider, SecondaryText)



        if (Flags.notificationsRedesignTemplates()) {

        if (notificationsRedesignTemplates()) {

            (mainColumn?.layoutParams as? MarginLayoutParams)?.let { mainColumnMargins ->

                mainColumnMargins.topMargin =

                    Notification.Builder.getContentMarginTop(
@@ -315,20 +346,16 @@ private class AODPromotedNotificationViewUpdater(root: View) { 


    private fun updateBase(

        content: PromotedNotificationContentModel,

        textView: ImageFloatingTextView? = null,

        showOldProgress: Boolean = true,

        textView: ImageFloatingTextView? = text,

    ) {

        updateHeader(content, hideTitle = true)

        updateHeader(content)



        updateTitle(title, content)

        updateText(textView ?: text, content)

        updateText(textView, content)

        updateSmallIcon(icon, content)

        updateImageView(rightIcon, content.skeletonLargeIcon)



        if (showOldProgress) {

        updateOldProgressBar(content)

    }

    }



    private fun updateBigPictureStyle(content: PromotedNotificationContentModel) {

        updateBase(content)
@@ -345,13 +372,14 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
    }



    private fun updateProgressStyle(content: PromotedNotificationContentModel) {

        updateBase(content, showOldProgress = false)

        updateBase(content)



        updateNewProgressBar(content)

    }



    private fun updateOldProgressBar(content: PromotedNotificationContentModel) {

        if (

            content.style == Style.Progress ||

                content.oldProgress == null ||

                content.oldProgress.max == 0 ||

                content.oldProgress.isIndeterminate
@@ -381,27 +409,24 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        }

    }



    private fun updateHeader(

        content: PromotedNotificationContentModel,

        hideTitle: Boolean = false,

    ) {

    private fun updateHeader(content: PromotedNotificationContentModel) {

        updateAppName(content)

        updateTextView(headerTextSecondary, content.subText)

        if (!hideTitle) {

            updateTitle(headerText, content)

        }

        // Not calling updateTitle(headerText, content) because the title is always a separate

        // element in the expanded layout used for AOD RONs.

        updateTimeAndChronometer(content)



        updateHeaderDividers(content, hideTitle = hideTitle)

        updateHeaderDividers(content)



        updateTopLine(content)

    }



    private fun updateHeaderDividers(

        content: PromotedNotificationContentModel,

        hideTitle: Boolean = false,

    ) {

        val hasAppName = content.appName != null && content.appName.isNotEmpty()

        val hasSubText = content.subText != null && content.subText.isNotEmpty()

        val hasHeader = content.title != null && content.title.isNotEmpty() && !hideTitle

    private fun updateHeaderDividers(content: PromotedNotificationContentModel) {

        val hasAppName = content.appName != null

        val hasSubText = content.subText != null

        // Not setting hasHeader = content.title because the title is always a separate element in

        // the expanded layout used for AOD RONs.

        val hasHeader = false

        val hasTimeOrChronometer = content.time != null



        val hasTextBeforeSubText = hasAppName
@@ -418,26 +443,27 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
    }



    private fun updateConversationHeader(content: PromotedNotificationContentModel) {

        updateTitle(conversationText, content)

        updateAppName(content)

        updateTimeAndChronometer(content)

        updateConversationHeaderDividers(content, hideTitle = true)



        updateImageView(verificationIcon, content.verificationIcon)

        updateTextView(verificationText, content.verificationText)



        updateConversationHeaderDividers(content)



        updateTopLine(content)



        updateSmallIcon(conversationIcon, content)

        updateTitle(conversationText, content)

    }



    private fun updateConversationHeaderDividers(

        content: PromotedNotificationContentModel,

        hideTitle: Boolean = false,

    ) {

        val hasTitle = content.title != null && !hideTitle

    private fun updateConversationHeaderDividers(content: PromotedNotificationContentModel) {

        // Not setting hasTitle = content.title because the title is always a separate element in

        // the expanded layout used for AOD RONs.

        val hasTitle = false

        val hasAppName = content.appName != null

        val hasTimeOrChronometer = content.time != null

        val hasVerification =

            !content.verificationIcon.isNullOrEmpty() || !content.verificationText.isNullOrEmpty()

            !content.verificationIcon.isNullOrEmpty() || content.verificationText != null



        val hasTextBeforeAppName = hasTitle

        val hasTextBeforeTime = hasTitle || hasAppName
@@ -457,6 +483,10 @@ 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)

    }
@@ -505,6 +535,10 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        chronometer?.appendFontFeatureSetting("tnum")

    }



    private fun updateTopLine(content: PromotedNotificationContentModel) {

        topLine?.headerTextMarginEnd = content.imageEndMarginPxIfHasLargeIcon

    }



    private fun inflateOldProgressBar() {

        if (oldProgressBar != null) {

            return
@@ -518,7 +552,8 @@ private class AODPromotedNotificationViewUpdater(root: View) { 
        view: ImageFloatingTextView?,

        content: PromotedNotificationContentModel,

    ) {

        view?.setHasImage(false)

        view?.setHasImage(!content.skeletonLargeIcon.isNullOrEmpty())

        view?.setNumIndentLines(if (content.title != null) 0 else 1)

        updateTextView(view, content.text)

    }

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

+19 −9
Original line number Diff line number Diff line
@@ -183,9 +183,10 @@ constructor( 
    private fun Notification.smallIconModel(imageModelProvider: ImageModelProvider): ImageModel? =

        imageModelProvider.getImageModel(smallIcon, SmallSquare)



    private fun Notification.title(): CharSequence? = extras?.getCharSequence(EXTRA_TITLE)

    private fun Notification.title(): CharSequence? = getCharSequenceExtraUnlessEmpty(EXTRA_TITLE)



    private fun Notification.bigTitle(): CharSequence? = extras?.getCharSequence(EXTRA_TITLE_BIG)

    private fun Notification.bigTitle(): CharSequence? =

        getCharSequenceExtraUnlessEmpty(EXTRA_TITLE_BIG)



    private fun Notification.callPerson(): Person? =

        extras?.getParcelable(EXTRA_CALL_PERSON, Person::class.java)
@@ -200,9 +201,10 @@ constructor( 
        } ?: title()

    }



    private fun Notification.text(): CharSequence? = extras?.getCharSequence(EXTRA_TEXT)

    private fun Notification.text(): CharSequence? = getCharSequenceExtraUnlessEmpty(EXTRA_TEXT)



    private fun Notification.bigText(): CharSequence? = extras?.getCharSequence(EXTRA_BIG_TEXT)

    private fun Notification.bigText(): CharSequence? =

        getCharSequenceExtraUnlessEmpty(EXTRA_BIG_TEXT)



    private fun Notification.text(style: Notification.Style?): CharSequence? {

        return when (style) {
@@ -211,17 +213,17 @@ constructor( 
        } ?: text()

    }



    private fun Notification.subText(): String? = extras?.getString(EXTRA_SUB_TEXT)

    private fun Notification.subText(): String? = getStringExtraUnlessEmpty(EXTRA_SUB_TEXT)



    private fun Notification.shortCriticalText(): String? {

        if (!android.app.Flags.apiRichOngoing()) {

            return null

        }

        if (this.shortCriticalText != null) {

            return this.shortCriticalText

        if (shortCriticalText != null) {

            return shortCriticalText

        }

        if (Flags.promoteNotificationsAutomatically()) {

            return this.extras?.getString(EXTRA_AUTOMATICALLY_EXTRACTED_SHORT_CRITICAL_TEXT)

            return getStringExtraUnlessEmpty(EXTRA_AUTOMATICALLY_EXTRACTED_SHORT_CRITICAL_TEXT)

        }

        return null

    }
@@ -277,7 +279,7 @@ constructor( 
        }



    private fun Notification.verificationText(): CharSequence? =

        extras.getCharSequence(EXTRA_VERIFICATION_TEXT)

        getCharSequenceExtraUnlessEmpty(EXTRA_VERIFICATION_TEXT)



    private fun Notification.Builder.extractStyleContent(

        notification: Notification,
@@ -344,3 +346,11 @@ constructor( 
        contentBuilder.newProgress = createProgressModel(0xffffffff.toInt(), 0xff000000.toInt())

    }

}



private fun Notification.getCharSequenceExtraUnlessEmpty(key: String): CharSequence? =

    extras?.getCharSequence(key)?.takeUnlessEmpty()



private fun Notification.getStringExtraUnlessEmpty(key: String): String? =

    extras?.getString(key)?.takeUnlessEmpty()



private fun <T : CharSequence> T.takeUnlessEmpty(): T? = takeUnless { it.isEmpty() }