[components] Merge mozilla-mobile/android-components#4130

4130: Closes mozilla-mobile/android-components#3925: Adding meaningful content descriptions to tracking protection toolbar icon for different states. r=rocketsroger a=Amejia481 Co-authored-by: Arturo Mejia <[email protected]> X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@a5f043c
JohanLorenzo · Aug 23, 2019 · 92dc1a8 · 92dc1a8
1 parent c7d68cf
commit 92dc1a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
 {
   "name": "mozilla-mobile/firefox-android",
   "revs": {
-    "ac-prep": "f2b1549ae36cd1142d3ec00a72d7d01832a1936c"
+    "ac-prep": "a5f043c2becd030d7856d2ee93a1cef2652c8f22"
   }
 }
diff --git a/...fox-android/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/...fox-android/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -6,9 +6,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>