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

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

Merge "[AOD RONs] Remove unused person{Icon,Name} from content model" into main

parents 9cbaa81f 22101f2c

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

+0 −2
Original line number Diff line number Diff line
@@ -364,8 +364,6 @@ constructor( 
        contentBuilder: PromotedNotificationContentModel.Builder,

        imageModelProvider: ImageModelProvider,

    ) {

        contentBuilder.personIcon = null // TODO

        contentBuilder.personName = null // TODO

        contentBuilder.verificationIcon = notification.skeletonVerificationIcon(imageModelProvider)

        contentBuilder.verificationText = notification.verificationText()

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/shared/model/PromotedNotificationContentModel.kt

+0 −8
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ data class PromotedNotificationContentModel( 
    val style: Style,



    // for CallStyle:

    val personIcon: ImageModel?,

    val personName: CharSequence?,

    val verificationIcon: ImageModel?,

    val verificationText: CharSequence?,
@@ -114,8 +112,6 @@ data class PromotedNotificationContentModel( 
        var colors: Colors = Colors(backgroundColor = 0, primaryTextColor = 0)



        // for CallStyle:

        var personIcon: ImageModel? = null

        var personName: CharSequence? = null

        var verificationIcon: ImageModel? = null

        var verificationText: CharSequence? = null
@@ -140,8 +136,6 @@ data class PromotedNotificationContentModel( 
                oldProgress = oldProgress,

                colors = colors,

                style = style,

                personIcon = personIcon,

                personName = personName,

                verificationIcon = verificationIcon,

                verificationText = verificationText,

                newProgress = newProgress,
@@ -200,8 +194,6 @@ data class PromotedNotificationContentModel( 
            "oldProgress=$oldProgress, " +

            "colors=$colors, " +

            "style=$style, " +

            "personIcon=${personIcon?.toRedactedString()}, " +

            "personName=${personName?.toRedactedString()}, " +

            "verificationIcon=$verificationIcon, " +

            "verificationText=$verificationText, " +

            "newProgress=$newProgress)")