Merge "[RONs] bind iconLevel to small icon view" into main (a92e2162) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,7 @@ private class AODPromotedNotificationViewUpdater(root: View) {
		) {
		// Icon binding must be called in this order
		updateImageView(icon, content.smallIcon)
		icon?.setImageLevel(content.iconLevel)
		icon?.setBackgroundColor(Background.colorInt)
		icon?.originalIconColor = PrimaryText.colorInt

+1 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ constructor(
		contentBuilder.wasPromotedAutomatically =
		notification.extras.getBoolean(EXTRA_WAS_AUTOMATICALLY_PROMOTED, false)
		contentBuilder.smallIcon = notification.smallIconModel(imageModelProvider)
		contentBuilder.iconLevel = notification.iconLevel
		contentBuilder.appName = notification.loadHeaderAppName(context)
		contentBuilder.subText = notification.subText()
		contentBuilder.time = notification.extractWhen()

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ data class PromotedNotificationContentModel(
		*/
		val wasPromotedAutomatically: Boolean,
		val smallIcon: ImageModel?,
		val iconLevel: Int,
		val appName: CharSequence?,
		val subText: CharSequence?,
		val shortCriticalText: String?,
		@@ -67,6 +68,7 @@ data class PromotedNotificationContentModel(
		class Builder(val key: String) {
		var wasPromotedAutomatically: Boolean = false
		var smallIcon: ImageModel? = null
		var iconLevel: Int = 0
		var appName: CharSequence? = null
		var subText: CharSequence? = null
		var time: When? = null
		@@ -94,6 +96,7 @@ data class PromotedNotificationContentModel(
		identity = Identity(key, style),
		wasPromotedAutomatically = wasPromotedAutomatically,
		smallIcon = smallIcon,
		iconLevel = iconLevel,
		appName = appName,
		subText = subText,
		shortCriticalText = shortCriticalText,