For #12565 Implement the common part of search widget in Android Comp…

…onents
mozilla-mobile · Aug 11, 2022 · 4d4565e · 4d4565e
2 parents 7d09c1d + eaabbcb
commit 4d4565e
Show file tree

Hide file tree

Showing 18 changed files with 209 additions and 126 deletions.
diff --git a/build.gradle b/build.gradle
@@ -76,6 +76,22 @@ subprojects {
     }
 
     project.configurations.all {
+        // Dependencies can't depend on a different major version of Glean than A-C itself.
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'org.mozilla.telemetry'
+                    && details.requested.name.contains('glean') ) {
+                def requested = details.requested.version.tokenize(".")
+                def defined = Versions.mozilla_glean.tokenize(".")
+                // Check the major version
+                if (requested[0] != defined[0]) {
+                    throw new AssertionError("Cannot resolve to a single Glean version. Requested: ${details.requested.version}, A-C uses: ${Versions.mozilla_glean}")
+                } else {
+                    // Enforce that all (transitive) dependencies are using the defined Glean version
+                    details.useVersion Versions.mozilla_glean
+                }
+            }
+        }
+
         // Enforce that all (transitive) dependencies are using the same support library version as we do.
         resolutionStrategy.eachDependency { details ->
             if (details.requested.group == 'com.android.support'

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -30,9 +30,12 @@ object Versions {
     const val disklrucache = "2.0.2"
     const val leakcanary = "2.8.1"
 
-    const val mozilla_appservices = "93.8.0"
+    // When upgrading mozilla_appservices, also upgrade the version in the
+    // `getApplicationServiceVersion()` method in NimbusGradlePlugin.groovy.
+    const val mozilla_appservices = "94.0.1"
 
-    const val mozilla_glean = "51.0.1"
+    // DO NOT MODIFY MANUALLY. This is auto-updated along with GeckoView.
+    const val mozilla_glean = "51.1.0"
 
     const val material = "1.2.1"
 

diff --git a/buildSrc/src/main/java/Gecko.kt b/buildSrc/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "105.0.20220808092108"
+    const val version = "105.0.20220810094530"
 
     /**
      * GeckoView channel

diff --git a/components/browser/errorpages/src/main/res/values-co/strings.xml b/components/browser/errorpages/src/main/res/values-co/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
 
     <!-- The button that appears at the bottom of an error page. -->
     <string name="mozac_browser_errorpages_page_refresh">Ripruvà</string>
@@ -42,6 +42,32 @@
     <!-- The text shown inside the advanced options button used to bypass the invalid SSL certificate. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_cert_accept_temporary">Accettà u risicu è cuntinuà</string>
 
+    <!-- The document title and heading of the error page shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_title">Stu situ web richiede una cunnessione sicura.</string>
+
+    <!-- The error message shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_message"><![CDATA[
+      <ul>
+         <li>A pagina chì vò circate à fighjà ùn pò micca esse affissata perchè u situ web richiede una cunnessione sicura.</li>
+         <li>Sicuramente, stu prublema hè cagiunatu da u situ web, è ùn pudete fà nunda per què.</li>
+         <li>Ma pudete cuntattà l’amministratore di stu situ web per infurmallu di stu prublema.</li>
+      </ul>
+    ]]></string>
+
+    <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_advanced">Espertu…</string>
+
+    <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
+    <string moz:removedIn="104" name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo" tools:ignore="UnusedResources"><![CDATA[
+        <label> <b>%1$s</b> impiega una strategia di sicurità chjamata HTTP Strict Transport Security (HSTS), vole si dì chì <b>%2$s</b> pò solu ci cunnettesi di manera assicurizata. Ùn pudete micca aghjunghje un’eccezzione per visità stu situ.
+    ]]></string>
+    <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo2"><![CDATA[
+        <label> <b>%1$s</b> impiega una strategia di sicurità chjamata HTTP Strict Transport Security (HSTS), vole si dì chì <b>%2$s</b> pò solu ci cunnettesi di manera assicurizata. Ùn pudete micca aghjunghje un’eccezzione per visità stu situ. </label>
+    ]]></string>
+    <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_back">Ritornu</string>
+
     <!-- The document title and heading of the error page shown when the user's network connection is interrupted while connecting to a website. -->
     <string name="mozac_browser_errorpages_net_interrupt_title">A cunnessione hè stata interrotta</string>
     <!-- The error message shown when the user's network connection is interrupted while connecting to a website. -->

diff --git a/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt b/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt
@@ -185,6 +185,7 @@ data class Addon(
             "browsingData" to R.string.mozac_feature_addons_permissions_browser_data_description,
             "clipboardRead" to R.string.mozac_feature_addons_permissions_clipboard_read_description,
             "clipboardWrite" to R.string.mozac_feature_addons_permissions_clipboard_write_description,
+            "declarativeNetRequest" to R.string.mozac_feature_addons_permissions_declarative_net_request_description,
             "downloads" to R.string.mozac_feature_addons_permissions_downloads_description,
             "downloads.open" to R.string.mozac_feature_addons_permissions_downloads_open_description,
             "find" to R.string.mozac_feature_addons_permissions_find_description,

diff --git a/components/feature/addons/src/main/res/values-es-rMX/strings.xml b/components/feature/addons/src/main/res/values-es-rMX/strings.xml
@@ -38,6 +38,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_read_description">Obtener datos del portapapeles</string>
     <!-- Description for clipboard_write permission. -->
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Ingresar datos en el portapapeles</string>
+    <!-- Description for declarativeNetRequest permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloquear contenido en cualquier página</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Descargar archivos y leer y modificar el historial de descargas del navegador</string>
     <!-- Description for downloads_open permission. -->

diff --git a/components/feature/addons/src/main/res/values-ia/strings.xml b/components/feature/addons/src/main/res/values-ia/strings.xml
@@ -38,6 +38,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_read_description">Obtener datos ab le area de transferentia</string>
     <!-- Description for clipboard_write permission. -->
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Inserer le datos in le area de transferentia</string>
+    <!-- Description for declarativeNetRequest permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloca contento sur ulle pagina</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Discargar files e leger e modificar le chronologia de discargamentos del navigator</string>
     <!-- Description for downloads_open permission. -->

diff --git a/components/feature/addons/src/main/res/values-ko/strings.xml b/components/feature/addons/src/main/res/values-ko/strings.xml
@@ -38,6 +38,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_read_description">클립보드의 데이터 가져오기</string>
     <!-- Description for clipboard_write permission. -->
     <string name="mozac_feature_addons_permissions_clipboard_write_description">클립보드에 데이터 넣기</string>
+    <!-- Description for declarativeNetRequest permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_description">모든 페이지에서 콘텐츠 차단</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">파일을 다운로드하고 브라우저의 다운로드 기록을 읽고 수정</string>
     <!-- Description for downloads_open permission. -->

diff --git a/components/feature/addons/src/main/res/values/strings.xml b/components/feature/addons/src/main/res/values/strings.xml
@@ -41,6 +41,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_read_description">Get data from the clipboard</string>
     <!-- Description for clipboard_write permission. -->
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Input data to the clipboard</string>
+    <!-- Description for declarativeNetRequest permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_description">Block content on any page</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Download files and read and modify the browser’s download history</string>
     <!-- Description for downloads_open permission. -->

diff --git a/components/feature/addons/src/test/java/AddonTest.kt b/components/feature/addons/src/test/java/AddonTest.kt
@@ -29,6 +29,7 @@ class AddonTest {
                 "browsingData",
                 "clipboardRead",
                 "clipboardWrite",
+                "declarativeNetRequest",
                 "downloads",
                 "downloads.open",
                 "find",
@@ -59,6 +60,7 @@ class AddonTest {
             R.string.mozac_feature_addons_permissions_browser_data_description,
             R.string.mozac_feature_addons_permissions_clipboard_read_description,
             R.string.mozac_feature_addons_permissions_clipboard_write_description,
+            R.string.mozac_feature_addons_permissions_declarative_net_request_description,
             R.string.mozac_feature_addons_permissions_downloads_description,
             R.string.mozac_feature_addons_permissions_downloads_open_description,
             R.string.mozac_feature_addons_permissions_find_description,

diff --git a/components/feature/prompts/src/main/res/values-co/strings.xml b/components/feature/prompts/src/main/res/values-co/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Text for confirmation for a positive action in dialog  -->
     <string name="mozac_feature_prompts_ok">Vai</string>
     <!-- Text for confirmation for a negative action in dialog.  -->
@@ -84,11 +84,11 @@
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Urganizà l’identificazioni di cunnessione</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
-    <string name="mozac_feature_prompts_expand_logins_content_description">Spiegà l’identificazioni di cunnessione sugerite</string>
+    <string name="mozac_feature_prompts_expand_logins_content_description">Spiegà l’identificazioni di cunnessione suggerite</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
-    <string name="mozac_feature_prompts_collapse_logins_content_description">Ripiegà l’identificazioni di cunnessione sugerite</string>
+    <string name="mozac_feature_prompts_collapse_logins_content_description">Ripiegà l’identificazioni di cunnessione suggerite</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
-    <string name="mozac_feature_prompts_saved_logins">Identificazioni di cunnessione sugerite</string>
+    <string name="mozac_feature_prompts_saved_logins">Identificazioni di cunnessione suggerite</string>
 
     <!-- Strings shown in a dialog that appear when users try to refresh a certain kind of webpages -->
     <string name="mozac_feature_prompt_repost_title">Rimandà i dati à stu situ ?</string>
@@ -102,9 +102,9 @@
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Selezziunà una carta bancaria</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
-    <string name="mozac_feature_prompts_expand_credit_cards_content_description">Spiegà e carte bancarie sugerite</string>
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description">Spiegà e carte bancarie suggerite</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
-    <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Ripiegà e carte bancarie sugerite</string>
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Ripiegà e carte bancarie suggerite</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Urganizà e carte bancarie</string>
     <!-- Text for the title of a save credit card dialog. -->
@@ -113,4 +113,16 @@
     <string name="mozac_feature_prompts_update_credit_card_prompt_title">Mudificà a data di scadenza di a carta ?</string>
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">U numeru di a carta serà cifratu. U codice di sicurità ùn serà micca arregistratu.</string>
+
+    <!-- Address Autofill -->
+    <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
+    <string moz:removedIn="104" name="mozac_feature_prompts_select_address" tools:ignore="UnusedResources">Selezzione d’indirizzi</string>
+    <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
+    <string name="mozac_feature_prompts_select_address_2">Selezziunà un indirizzu</string>
+    <!-- Content description for expanding the select addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description">Spiegà l’indirizzi suggeriti</string>
+    <!-- Content description for collapsing the select address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description">Ripiegà l’indirizzi suggeriti</string>
+    <!-- Text for the manage addresses button. -->
+    <string name="mozac_feature_prompts_manage_address">Urganizà l’indirizzi</string>
 </resources>
diff --git a/components/feature/sitepermissions/src/main/res/values-co/strings.xml b/components/feature/sitepermissions/src/main/res/values-co/strings.xml
@@ -41,6 +41,8 @@
     <!-- Message of a dialog offering more context about the cross origin storage permission.
     %s is the name of the site URL (www.site1.example) trying to track the user's activity. -->
     <string name="mozac_feature_sitepermissions_storage_access_message">Forse preferite bluccà l’accessu s’ellu ùn hè micca chjaru perchè %s abbia bisognu di sti dati.</string>
+    <!-- Text for a negative button in the storage access permission request dialog. This button will not give access to this permission. -->
+    <string name="mozac_feature_sitepermissions_storage_access_not_allow">Bluccà</string>
     <!-- Clickable text that will open a new tab navigating the user to online documentation about specific features. -->
     <string name="mozac_feature_sitepermissions_learn_more_title">Sapene di più</string>
 </resources>
diff --git a/components/lib/crash/src/main/res/values-co/strings.xml b/components/lib/crash/src/main/res/values-co/strings.xml
@@ -24,6 +24,12 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Inviu di u raportu d’accidente à %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Culletta di i dati di l’accidente</string>
+
+    <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_telemetry_in_progress">Culletta di i dati di telemetria di l’accidente</string>
+
     <!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
     <string name="mozac_lib_crash_activity_title">Raporti d’accidente</string>
 

diff --git a/components/lib/crash/src/main/res/values-gn/strings.xml b/components/lib/crash/src/main/res/values-gn/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Emomarandu jejavygua %1$s-pe</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Ombyatyhína mba’ekuaarã javypyre</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Telemetría marandu ñembyaty rehegua</string>
 

diff --git a/components/lib/crash/src/main/res/values-hy-rAM/strings.xml b/components/lib/crash/src/main/res/values-hy-rAM/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Ուղարկել վթարի զեկույցը %1$s-ին</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Վթարի տվյալների հավաքում</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Վթարի հեռաչափության տվյալների հավաքում</string>
 

diff --git a/...gradle-plugin/src/main/groovy/mozilla/components/tooling/nimbus/NimbusGradlePlugin.groovy b/...gradle-plugin/src/main/groovy/mozilla/components/tooling/nimbus/NimbusGradlePlugin.groovy
@@ -171,7 +171,7 @@ class NimbusPlugin implements Plugin<Project> {
         // a) this plugin is going to live in the AS repo (eventually)
         // See https://github.com/mozilla-mobile/android-components/issues/11422 for tying this
         // to a version that is specified in buildSrc/src/main/java/Dependencies.kt
-        return "93.6.0"
+        return "94.0.1"
     }
 
     // Try one or more hosts to download the given file.

diff --git a/docs/Gemfile b/docs/Gemfile
@@ -8,19 +8,19 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.9.0"
+gem "jekyll", "~> 3.9.2"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.5.1"
 
 # Update kramdown
-gem "kramdown", ">= 2.3.0"
+gem "kramdown", ">= 2.3.2"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
-gem "github-pages", 207, group: :jekyll_plugins
+gem "github-pages", 227, group: :jekyll_plugins
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.13.0"
+  gem "jekyll-feed"
 end