From 5236f907e0030970086360d7b149d8b6ad803cae Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Mon, 7 Dec 2020 22:55:39 -0500
Subject: [PATCH] [components] Closes
 https://github.com/mozilla-mobile/android-components/issues/9131: Add site
 permission indicators in the toolbar.

X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@a5a6f514194ab65dcf39cca28c23ea7da1fab4a4
---
 _meta/mozilla-mobile-firefox-android.json                       | 2 +-
 .../components/browser/toolbar/src/main/res/values/strings.xml  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index f8bebfc601a..adbfbf33415 100644
--- 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": "ac788e1caf34b2bae236d33221e53d9e9de77ce9"
+    "ac-prep": "a5a6f514194ab65dcf39cca28c23ea7da1fab4a4"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 678e3911015..63bd4a57696 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -13,4 +13,6 @@
     <string name="mozac_browser_toolbar_content_description_site_info">Site information</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>
+    <!-- Content description: For the autoplay toolbar icon, it is set when the auto play permission is blocking content playing.-->
+    <string name="mozac_browser_toolbar_content_description_autoplay_blocked">Some content has been blocked by the autoplay setting</string>
 </resources>