commit 2b637764b38661a01e479f264631a208fe43704c
parent ba6969e6d43b9ffd94a81100f394484499e4daa7
Author: Segun Famisa <sfamisa@mozilla.com>
Date: Tue, 14 Oct 2025 09:55:09 +0000
Bug 1993969 - Start the nightly 146 development cycle. r=android-reviewers,android-l10n-reviewers,boek,delphine,pollymce
Strings expiring in version 143 have been removed
Differential Revision: https://phabricator.services.mozilla.com/D268395
Diffstat:
6 files changed, 10 insertions(+), 91 deletions(-)
diff --git a/mobile/android/android-components/docs/changelog.md b/mobile/android/android-components/docs/changelog.md
@@ -4,7 +4,9 @@ title: Changelog
permalink: /changelog/
---
-# 145.0 (In Development)
+# 146.0 (In Development)
+
+# 145.0
* **support-ktx**
* 🚒 Bug fixed [Bug 1979064](https://bugzilla.mozilla.org/show_bug.cgi?id=1979064). Added back the API checks for `Window.setupPersistentInsets` and `ImeInsetsSynchronizer.setup` as on Android <13 the insets framework is not reliable.
* **support-appservices**
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/DataGenerationHelper.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/DataGenerationHelper.kt
@@ -72,6 +72,8 @@ object DataGenerationHelper {
fun getStringResource(id: Int, argument: String = TestHelper.appName) = TestHelper.appContext.resources.getString(id, argument)
+ fun getStringResource(id: Int, vararg args: Any) = TestHelper.appContext.resources.getString(id, *args)
+
private val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
fun generateRandomString(stringLength: Int): String {
Log.i(TAG, "generateRandomString: Trying to generate a random string with $stringLength characters")
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -1183,7 +1183,11 @@ class BrowserRobot {
fun verifyWebCompatReporterViewItems(composeTestRule: ComposeTestRule, websiteURL: String) {
Log.i(TAG, "verifyWebCompatReporterViewItems: Trying to verify that the report broken site description is displayed")
composeTestRule.onNodeWithContentDescription(
- getStringResource(R.string.webcompat_reporter_description_2, appName) + " " + getStringResource(R.string.a11y_links_available),
+ getStringResource(
+ R.string.webcompat_reporter_description_3,
+ appName,
+ getStringResource(R.string.webcompat_reporter_learn_more),
+ ) + " " + getStringResource(R.string.a11y_links_available),
).assertIsDisplayed()
Log.i(TAG, "verifyWebCompatReporterViewItems: Verified that the report broken site description is displayed")
Log.i(TAG, "verifyWebCompatReporterViewItems: Trying to verify that the \"URL\" header is displayed")
diff --git a/mobile/android/fenix/app/src/main/res/values-zh-rCN/mozonline_strings.xml b/mobile/android/fenix/app/src/main/res/values-zh-rCN/mozonline_strings.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
- <!-- Privacy Notice-->
- <!-- Privacy Notice title-->
- <string name="privacy_notice_title">关于您的权利</string>
- <!-- Privacy Notice content-->
- <string name="privacy_notice_content">Mozilla Firefox 是一款自由开源软件，由来自世界各地成千上万的社区志愿者共同完成。以下几点您应该了解：
- \n\n•Firefox 提供给您时依照的条款为 Mozilla 公共许可证（MPL）。这表示您可以使用、复制和向他人分发 Firefox。我们也非常欢迎您按自己的需要修改 Firefox 的源代码。Mozilla 公共许可证还授予您分发您自己修改过的软件版本的权利。
- \n•您没有获得 Mozilla 基金会或其他任何一方的商标权利或许可，这包括但不限于 Firefox 的名称或标志。有关商标的其他信息在：这里。
- \n•Firefox 的一些功能（例如崩溃报告器）使您可以向 Mozilla 提供反馈。提交反馈的同时，您授权 Mozilla 使用反馈信息改进产品、在其网站上发布反馈信息，以及分发反馈内容。
- \n•关于我们如何使用您通过 Firefox 提交给 Mozilla 的个人信息和反馈，请参见 Firefox 隐私权政策。</string>
- <!-- Privacy Notice clickable-->
- <string name="privacy_notice_clickable1">Mozilla 公共许可证（MPL）</string>
- <!-- Privacy Notice clickable-->
- <string name="privacy_notice_clickable2">这里</string>
- <!-- Privacy Notice clickable-->
- <string name="privacy_notice_clickable3">Firefox 隐私权政策</string>
- <!-- Privacy Notice positive button-->
- <string name="privacy_notice_positive_button">同意并继续</string>
- <!-- Privacy Notice neutral button-->
- <string name="privacy_notice_neutral_button" moz:removedIn="96" tools:ignore="UnusedResources">退出应用</string>
- <string name="privacy_notice_neutral_button_2">不同意</string>
-
- <string name="preferences_site_permissions_description">此页面为所有网站的默认权限设置；如您曾对特定网站进行权限调整，则此网站会出现在“例外网站”中。</string>
-</resources>
-
diff --git a/mobile/android/fenix/app/src/main/res/values/mozonline_strings.xml b/mobile/android/fenix/app/src/main/res/values/mozonline_strings.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
- <!-- NB none of the strings in here are currently used, so it is fine to remove this file when we get to the next beta cut-->
-
- <!-- Privacy Notice-->
- <!-- Privacy Notice title-->
- <string name="privacy_notice_title" moz:removedIn="143" tools:ignore="UnusedResources">About your rights</string>
- <!-- Privacy Notice content-->
- <string name="privacy_notice_content" moz:removedIn="143" tools:ignore="UnusedResources">Mozilla Firefox is free and open source software, built by a community of thousands from all over the world. There are a few things you should know:
- \n\n•Firefox is made available to you under the terms of the Mozilla Public License. This means you may use, copy and distribute Firefox to others. You are also welcome to modify the source code of Firefox as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.
- \n•You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found here.
- \n•Some features in Firefox, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.
- \n•How we use your personal information and feedback submitted to Mozilla through Firefox is described in the Firefox Privacy Policy.</string>
- <!-- Privacy Notice clickable-->
- <string name="privacy_notice_clickable1" moz:removedIn="143" tools:ignore="UnusedResources">Mozilla Public License</string>
- <!-- Privacy Notice clickable-->
- <string name="privacy_notice_clickable2" moz:removedIn="143" tools:ignore="UnusedResources">found here</string>
- <!-- Privacy Notice clickable-->
- <string name="privacy_notice_clickable3" moz:removedIn="143" tools:ignore="UnusedResources">Firefox Privacy Policy</string>
- <!-- Privacy Notice positive button-->
- <string name="privacy_notice_positive_button" moz:removedIn="143" tools:ignore="UnusedResources">Agree and Continue</string>
- <!-- Privacy Notice neutral button-->
- <string name="privacy_notice_neutral_button_2" moz:removedIn="143" tools:ignore="UnusedResources">Disagree</string>
-
- <string name="preferences_site_permissions_description" moz:removedIn="143" tools:ignore="UnusedResources">This page shows the default permission settings to all sites; If the permissions of any specific site have been modified, this site will be shown in "Exceptions".</string>
-</resources>
diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml
@@ -305,8 +305,6 @@
%1$s is the name of the app (for example "Firefox"). -->
<string name="browser_menu_default_banner_title">Make %1$s your default</string>
<!-- Label text within the set as default banner -->
- <string name="browser_menu_default_banner_subtitle" moz:removedIn="143" tools:ignore="UnusedResources">Takes seconds. Change anytime.</string>
- <!-- Label text within the set as default banner -->
<string name="browser_menu_default_banner_subtitle_2">Fast, private, and made for you.</string>
<!-- Content description (not visible, for screen readers etc.) for the button that dismisses the set as default banner in the menu -->
<string name="browser_menu_default_banner_dismiss_promotion">Dismiss promotion</string>
@@ -533,8 +531,6 @@
<string name="onboarding_marketing_title" tools:ignore="BrandUsage,UnusedResources">Help us grow Firefox</string>
<!-- Marketing onboarding page body. 'Firefox' is intentionally hardcoded. -->
<string name="onboarding_marketing_body" tools:ignore="BrandUsage,UnusedResources">When you share how you discovered Firefox and that you use it, you help us introduce our browser to more people.</string>
- <!-- Marketing onboarding page opt-in checkbox. 'Mozilla' is intentionally hardcoded. -->
- <string name="onboarding_marketing_opt_in_checkbox" moz:removedIn="143" tools:ignore="UnusedResources">Share minimal data with Mozilla’s marketing technology partners. This data is never sold or used to show you ads.</string>
<!-- Marketing onboarding page opt-out checkbox. Unchecking the box does not increase data collection. Our data practices remain the same. 'Mozilla' is intentionally hardcoded. -->
<string name="onboarding_marketing_opt_out_checkbox">Share data with Mozilla’s marketing technology partners. This data is never sold or used to show you ads.</string>
<!-- Marketing onboarding page clickable link text to "learn more" on how data is used. -->
@@ -1523,8 +1519,6 @@
<!-- WebCompat Reporter -->
<!-- The title of the Web Compat Reporter feature. This is displayed in the top app bar. -->
<string name="webcompat_reporter_screen_title">Report broken site</string>
- <!-- The description of the Web Compat Reporter feature, which has a "learn more" button text for navigating to a SUMO link to learn more about reporting a broken site. %1$s is the name of the app (for example "Firefox"). -->
- <string name="webcompat_reporter_description_2" moz:removedIn="143" tools:ignore="UnusedResources">Your report helps us understand and fix issues in %1$s to make it better for everyone. Learn more</string>
<!-- The description of the Web Compat Reporter feature, which has a "learn more" button text for navigating to a SUMO link to learn more about reporting a broken site. %1$s is the name of the app (for example "Firefox") and %2$s is the learn more button. -->
<string name="webcompat_reporter_description_3">Your report helps us understand and fix issues in %1$s to make it better for everyone. %2$s</string>
<!-- The button text for navigating to the SUMO link to learn more about reporting a broken site. -->
@@ -1619,12 +1613,8 @@
<string name="unsubmitted_crash_requested_by_devs_learn_more">Learn More</string>
<!-- Bookmarks -->
- <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
- <string name="bookmark_delete_folder_confirmation_dialog" tools:ignore="UnusedResources" moz:removedIn="143">Are you sure you want to delete this folder?</string>
<!-- Confirmation message for a dialog confirming if the user wants to delete multiple items. -->
<string name="bookmark_delete_folders_confirmation_dialog">Are you sure you want to delete the selected items?</string>
- <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. %s is the name of the app (for example "Firefox"). -->
- <string name="bookmark_delete_multiple_folders_confirmation_dialog" tools:ignore="UnusedResources" moz:removedIn="143">%s will delete the selected items.</string>
<!-- Text for the cancel button on delete bookmark dialog -->
<string name="bookmark_delete_negative">Cancel</string>
<!-- Screen title for adding a bookmarks folder -->
@@ -1661,8 +1651,6 @@
<string name="bookmark_menu_open_all_in_private_tabs_button">Open all in private tabs</string>
<!-- Bookmark overflow menu delete button -->
<string name="bookmark_menu_delete_button">Delete</string>
- <!--Bookmark overflow menu save button -->
- <string name="bookmark_menu_save_button" tools:ignore="UnusedResources" moz:removedIn="143">Save</string>
<!-- Accessibility label for sorting options -->
<string name="bookmark_sort_menu_content_desc">Sorting options</string>
<!-- Label for button to sort bookmarks by user-defined sort order in the bookmark sorting overflow menu. -->
@@ -1682,8 +1670,6 @@
<string name="edit_bookmark_fragment_title">Edit bookmark</string>
<!-- Bookmark folder editing screen title -->
<string name="edit_bookmark_folder_fragment_title">Edit folder</string>
- <!-- Bookmark sign in button message -->
- <string name="bookmark_sign_in_button" tools:ignore="UnusedResources" moz:removedIn="143">Sign in to see synced bookmarks</string>
<!-- Bookmark URL editing field label -->
<string name="bookmark_url_label">URL</string>
<!-- Bookmark FOLDER editing field label -->
@@ -1694,31 +1680,19 @@
<string name="bookmark_name_label">NAME</string>
<!-- Label for a text input field for a bookmark or folder name -->
<string name="bookmark_name_label_normal_case">Name</string>
- <!-- Bookmark add folder screen title -->
- <string name="bookmark_add_folder_fragment_label" tools:ignore="UnusedResources" moz:removedIn="143">Add folder</string>
<!-- Bookmark select folder screen title -->
<string name="bookmark_select_folder_fragment_label">Select folder</string>
- <!-- Bookmark editing error missing title -->
- <string name="bookmark_empty_title_error" tools:ignore="UnusedResources" moz:removedIn="143">Must have a title</string>
<!-- Bookmark editing error missing or improper URL -->
<string name="bookmark_invalid_url_error">Invalid URL</string>
- <!-- Bookmark screen message for empty bookmarks folder -->
- <string name="bookmarks_empty_message" tools:ignore="UnusedResources" moz:removedIn="143">No bookmarks here</string>
<!-- Bookmark snackbar message on deletion
%1$s is the host part of the URL of the bookmark deleted, if any -->
<string name="bookmark_deletion_snackbar_message">Deleted %1$s</string>
- <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders -->
- <string name="bookmark_deletion_multiple_snackbar_message_2" tools:ignore="UnusedResources" moz:removedIn="143">Bookmarks deleted</string>
- <!-- Bookmark snackbar message on deleting multiple bookmarks including folders -->
- <string name="bookmark_deletion_multiple_snackbar_message_3" tools:ignore="UnusedResources" moz:removedIn="143">Deleting selected folders</string>
<!-- Bookmark undo button for deletion snackbar action -->
<string name="bookmark_undo_deletion">UNDO</string>
<!-- Bookmark snackbar message for deleting a single item. %s is the title of the item being deleted -->
<string name="bookmark_delete_single_item">Deleted %s</string>
<!-- Bookmark snackbar message for deleting multiple items. %s is the number of items being deleted -->
<string name="bookmark_delete_multiple_items">Deleted items: %s</string>
- <!-- Text for the button to search all bookmarks -->
- <string name="bookmark_search" tools:ignore="UnusedResources" moz:removedIn="143">Enter search terms</string>
<!-- Content description for the bookmark navigation bar back button -->
<string name="bookmark_navigate_back_button_content_description">Navigate back</string>
<!-- Content description for the bookmark list new folder navigation bar button -->
@@ -1993,8 +1967,6 @@
<string name="preferences_not_take_survey">No Thanks</string>
<!-- Snackbar -->
- <!-- Text shown in snackbar when user deletes a collection -->
- <string name="snackbar_collection_deleted" tools:ignore="UnusedResources" moz:removedIn="143">Collection deleted</string>
<!-- Text shown in snackbar when user closes a tab -->
<string name="snackbar_tab_closed">Tab closed</string>
<!-- Text shown in snackbar when user closes all tabs -->
@@ -2028,8 +2000,6 @@
<string name="qr_scanner_dialog_invalid_ok">OK</string>
<!-- Tab collection deletion prompt dialog message. %1$s is the collection name. -->
<string name="tab_collection_dialog_message">Are you sure you want to delete %1$s?</string>
- <!-- Tab collection deletion prompt dialog option to delete the collection -->
- <string name="tab_collection_dialog_positive" tools:ignore="UnusedResources" moz:removedIn="143">Delete</string>
<!-- Sample text for accessibility font size -->
<string name="accessibility_text_size_sample_text_1">This is sample text. It is here to show how text will appear when you increase or decrease the size with this setting.</string>
<!-- Summary for Accessibility Text Size Scaling Preference -->
@@ -2707,8 +2677,6 @@
<string name="confirm_clear_permission_site">Are you sure that you want to clear this permission for this site?</string>
<!-- label shown when there are not site exceptions to show in the site exception settings -->
<string name="no_site_exceptions">No site exceptions</string>
- <!-- Bookmark deletion confirmation -->
- <string name="bookmark_deletion_confirmation" tools:ignore="UnusedResources" moz:removedIn="143">Are you sure you want to delete this bookmark?</string>
<!-- Browser menu button that adds a shortcut to the home fragment -->
<string name="browser_menu_add_to_shortcuts">Add to shortcuts</string>
<!-- Browser menu button that removes a shortcut from the home fragment -->
@@ -2871,9 +2839,6 @@
<!-- Content description for the action bar "up" button -->
<string name="action_bar_up_description">Navigate up</string>
- <!-- Content description for privacy content close button -->
- <string name="privacy_content_close_button_content_description" tools:ignore="UnusedResources" moz:removedIn="143">Close</string>
-
<!-- Pocket recommended stories -->
<!-- Header text for a section on the home screen. -->
<string name="pocket_stories_header_2">Stories</string>
@@ -3455,8 +3420,6 @@
<!-- The title of the explore extensions task for the setup checklist -->
<string name="setup_checklist_task_explore_extensions">Explore extensions</string>
<!-- The title of the search widget task for the setup checklist -->
- <string name="setup_checklist_task_search_widget" moz:removedIn="143" tools:ignore="UnusedResources">Install search widget</string>
- <!-- The title of the search widget task for the setup checklist -->
<string name="setup_checklist_task_search_widget_2">Explore search widget</string>
<!-- ===== Setup checklist feature: Group titles ===== -->
