Merge "[SettingsLib] Dynamically update StatusBannerPreference icon tint" into main

1 files changed, 11 insertions, 2 deletions

diff --git a/packages/SettingsLib/StatusBannerPreference/src/com/android/settingslib/widget/StatusBannerPreference.kt b/packages/SettingsLib/StatusBannerPreference/src/com/android/settingslib/widget/StatusBannerPreference.kt
index e6c6638f7de4..c62aed1da352 100644
--- a/packages/SettingsLib/StatusBannerPreference/src/com/android/settingslib/widget/StatusBannerPreference.kt
+++ b/packages/SettingsLib/StatusBannerPreference/src/com/android/settingslib/widget/StatusBannerPreference.kt
@@ -49,6 +49,7 @@ class StatusBannerPreference @JvmOverloads constructor(
     var iconLevel: BannerStatus = BannerStatus.GENERIC
         set(value) {
             field = value
+            updateIconTint(value)
             notifyChanged()
         }
     var buttonLevel: BannerStatus = BannerStatus.GENERIC
@@ -81,7 +82,7 @@ class StatusBannerPreference @JvmOverloads constructor(
             if (icon == null) {
                 icon = getIconDrawable(iconLevel)
             } else {
-                icon!!.setTintList(ColorStateList.valueOf(getBackgroundColor(iconLevel)))
+                updateIconTint(iconLevel)
             }
             buttonLevel = getInteger(R.styleable.StatusBanner_buttonLevel, 0).toBannerStatus()
             buttonText = getString(R.styleable.StatusBanner_buttonText) ?: ""
@@ -252,4 +253,12 @@ class StatusBannerPreference @JvmOverloads constructor(
             )
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * Sets the icon's tint color based on the icon level. If an icon is not defined, this is a
+     * no-op.
+     */
+    private fun updateIconTint(iconLevel: BannerStatus) {
+        icon?.setTintList(ColorStateList.valueOf(getBackgroundColor(iconLevel)))
+    }
+}