Merge #4130

4130: Closes #3925: Adding meaningful content descriptions to tracking protection toolbar icon for different states. r=rocketsroger a=Amejia481



Co-authored-by: Arturo Mejia <[email protected]>

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 -> {

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>