From 53d16e78e17df0ccd16d0604153040afcc612878 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Tue, 8 Sep 2020 14:56:25 -0700
Subject: [PATCH] For #14460: Fix PBM notification tint (#14699)

---
 .../onboarding/OnboardingPrivateBrowsingViewHolder.kt  | 10 +++++++---
 app/src/main/res/drawable/ic_private_browsing.xml      |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt
index c0d5ff877..6f52c8341 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt
@@ -11,10 +11,12 @@ import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ImageSpan
 import android.view.View
+import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.onboarding_private_browsing.view.*
+import mozilla.components.support.ktx.android.content.getColorFromAttr
+import mozilla.components.support.ktx.android.content.getDrawableWithTint
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
@@ -33,7 +35,8 @@ class OnboardingPrivateBrowsingViewHolder(
         val inlineIcon = PrivateBrowsingImageSpan(
             view.context,
             R.drawable.ic_private_browsing,
-            view.description_text_once.lineHeight
+            tint = view.context.getColorFromAttr(R.attr.primaryText),
+            size = view.description_text_once.lineHeight
         )
 
         val text = SpannableString(view.context.getString(R.string.onboarding_private_browsing_description1)).apply {
@@ -57,9 +60,10 @@ class OnboardingPrivateBrowsingViewHolder(
     class PrivateBrowsingImageSpan(
         context: Context,
         @DrawableRes drawableId: Int,
+        @ColorInt tint: Int,
         size: Int
     ) : ImageSpan(
-        AppCompatResources.getDrawable(context, drawableId)!!.apply { setBounds(size) }
+        context.getDrawableWithTint(drawableId, tint)!!.apply { setBounds(size) }
     ) {
         override fun draw(
             canvas: Canvas,
diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml
index 9bef32e8a..baf1a8062 100644
--- a/app/src/main/res/drawable/ic_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_private_browsing.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/primaryText"
+        android:fillColor="@color/photonWhite"
         android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z" />
 </vector>