From 41cf2e5f3ace238a270e5411989cf0414e63dccc Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Wed, 14 Aug 2019 19:25:21 -0400
Subject: [PATCH] Closes #3925: Adding meaningful content descriptions to
 tracking protection toolbar icon for different states.

---
 .../browser/toolbar/display/TrackingProtectionIconView.kt     | 2 --
 components/browser/toolbar/src/main/res/values/strings.xml    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/TrackingProtectionIconView.kt b/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/TrackingProtectionIconView.kt
index 3844fa1affd..d79cca42483 100644
--- a/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/TrackingProtectionIconView.kt
+++ b/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/TrackingProtectionIconView.kt
@@ -4,7 +4,6 @@
 
 package mozilla.components.browser.toolbar.display
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
@@ -82,7 +81,6 @@ internal class TrackingProtectionIconView @JvmOverloads constructor(
         return drawableStates
     }
 
-    @SuppressLint("NewApi")
     private fun updateIcon() {
         val descriptionId = when (siteTrackingProtection) {
             ON_NO_TRACKERS_BLOCKED -> {
diff --git a/components/browser/toolbar/src/main/res/values/strings.xml b/components/browser/toolbar/src/main/res/values/strings.xml
index 87e66eb2c84..157846c900c 100644
--- a/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/components/browser/toolbar/src/main/res/values/strings.xml
@@ -9,9 +9,9 @@
     <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
     <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tracking Protection is on</string>
     <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, and trackers have been blocked or detected.-->
-    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_trackers_blocked">Tracking Protection is active blocking trackers</string>
+    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_trackers_blocked">Tracking Protection has blocked trackers</string>
     <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection disabled.-->
-    <string name="mozac_browser_toolbar_content_description_tracking_protection_off_for_a_site">Tracking Protection is disabled for this site</string>
+    <string name="mozac_browser_toolbar_content_description_tracking_protection_off_for_a_site">Tracking Protection is off for this site</string>
     <!-- Announcement made by the screen reader when the progress bar is shown and a page is loading -->
     <string name="mozac_browser_toolbar_progress_loading">Loading</string>
 </resources>