Merge remote-tracking branch 'firefox-android/fenix/141.0.1' into iceraven

Author: akliuxingyuan

app/metrics.yaml

@@ -162,14 +162,15 @@ events:
           A string containing the name of the item the user tapped. These items
           include:
           add_bookmark, add_to_homescreen, add_to_top_sites, addon_details, addons_manager,
-          back, back_long_press, bookmark, bookmarks, desktop_view_off,
-          desktop_view_off_custom_tab, desktop_view_on, desktop_view_on_custom_tab,
-          discover_more_extensions, dismiss_menu_banner, web_extension_browser_action_clicked,
-          downloads, edit_bookmark, extensions_learn_more, find_in_page, find_in_page_custom_tab,
-          forward, forward_long_press, history, install_addon, menu_banner, new_tab, open_in_app,
-          open_in_fenix, quit, reader_mode_appearance, reload, remove_from_top_sites,
-          save_to_collection, set_default_browser, settings, share, share_custom_tab, stop,
-          sync_account, translate and print_content.
+          back, back_long_press, bookmark, bookmarks, custom_back, custom_back_long_press,
+          custom_desktop_view_off, custom_desktop_view_on, custom_find_in_page,
+          custom_forward, custom_forward_long_press, custom_share, desktop_view_off,
+          desktop_view_on, discover_more_extensions, dismiss_menu_banner, downloads,
+          edit_bookmark, extensions_learn_more, find_in_page, forward, forward_long_press,
+          history, install_addon, installed_addon_details, menu_banner, new_tab, open_in_app,
+          open_in_fenix, print_content, quit, reader_mode_appearance, reload, remove_from_top_sites,
+          save_to_collection, set_default_browser, settings, share, stop, sync_account,
+          translate and web_extension_browser_action_clicked.
         type: string
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/1024

app/nimbus.fml.yaml

@@ -52,6 +52,7 @@ features:
             "pocket": true,
             "pocket-sponsored-stories": true,
             "synced-tabs": true,
+            "collections": true,
           }
     defaults:
       - channel: nightly
@@ -63,6 +64,7 @@ features:
             "recent-explorations": true,
             "pocket": true,
             "synced-tabs": true,
+            "collections": true,
           }
         }
   nimbus-validation:
@@ -648,6 +650,14 @@ features:
         value:
           enabled: true
 
+  override-user-specified-homepage-sections:
+    description: Whether to ignore the user-specified homepage section visibility settings and hide the options in the settings.
+    variables:
+      enabled:
+        description: >
+          When true, ignore the user-specified homepage section visibility settings, and hide the toggle options in the settings.
+        type: Boolean
+        default: false
   microsurveys:
     description: Feature for microsurveys.
     variables:
@@ -931,6 +941,8 @@ types:
           description: Subsection of the Pocket homescreen section which shows sponsored stories.
         synced-tabs:
           description: The synced tabs section of the homepage.
+        collections:
+          description: The collections section of the homepage.
 
     MR2022Section:
       description: The identifiers for the sections of the MR 2022.

app/src/androidTest/java/org/mozilla/fenix/ui/EnhancedTrackingProtectionTest.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.core.net.toUri
 import androidx.test.espresso.Espresso.pressBack
 import mozilla.components.concept.engine.utils.EngineReleaseChannel
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@@ -127,6 +128,7 @@ class EnhancedTrackingProtectionTest : TestSetup() {
 
     // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/339712
     // Tests adding ETP exceptions to websites and keeping that preference after restart
+    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1948448")
     @SmokeTest
     @Test
     fun disablingETPOnAWebsiteAddsItToExceptionListTest() {
@@ -193,6 +195,7 @@ class EnhancedTrackingProtectionTest : TestSetup() {
 
     // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/339713
     // Tests removing TP exceptions individually or all at once
+    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1977952")
     @Test
     fun clearWebsitesFromTPExceptionListTest() {
         val firstPage = getGenericAsset(mockWebServer, 1)

app/src/androidTest/java/org/mozilla/fenix/ui/HTTPSFirstModeTest.kt

@@ -6,6 +6,7 @@ package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.core.net.toUri
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -22,6 +23,7 @@ class HTTPSFirstModeTest {
     @get:Rule
     val memoryLeaksRule = DetectMemoryLeaksRule()
 
+    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1950289")
     @Test
     fun httpsFirstModeImplicitSchemeTest() {
         navigationToolbar {
@@ -32,6 +34,7 @@ class HTTPSFirstModeTest {
         }
     }
 
+    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1947969")
     @Test
     fun httpsFirstModeExplicitSchemeTest() {
         navigationToolbar {

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt

@@ -6,6 +6,7 @@ package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.core.net.toUri
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SkipLeaks
@@ -71,6 +72,7 @@ class SettingsHTTPSOnlyModeTest : TestSetup() {
     }
 
     // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1724827
+    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1826317")
     @SmokeTest
     @Test
     fun httpsOnlyModeEnabledInNormalBrowsingTest() {
@@ -182,6 +184,7 @@ class SettingsHTTPSOnlyModeTest : TestSetup() {
     }
 
     // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2091058
+    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1941261")
     @Test
     @SkipLeaks
     fun turnOffHttpsOnlyModeTest() {

app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

@@ -175,56 +175,61 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
     }
 
     private fun initTranslationsAction(context: Context, view: View) {
-        // Do not add translation page action if device doesn't have large window
-        if (!isLargeWindow()) {
-            return
-        }
-
         if (
             !FxNimbus.features.translations.value().mainFlowToolbarEnabled
         ) {
             return
         }
 
-        val translationsAction = Toolbar.ActionButton(
-            AppCompatResources.getDrawable(
-                context,
-                R.drawable.mozac_ic_translate_24,
-            ),
-            contentDescription = context.getString(R.string.browser_toolbar_translate),
-            iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
-            visible = { translationsAvailable },
-            weight = { TRANSLATIONS_WEIGHT },
-            listener = {
-                browserToolbarInteractor.onTranslationsButtonClicked()
-            },
-        )
-        (browserToolbarView as BrowserToolbarView).toolbar.addPageAction(translationsAction)
+        // Do not add translation page action if device doesn't have large window
+        val translationsAction = if (isLargeWindow()) {
+            Toolbar.ActionButton(
+                AppCompatResources.getDrawable(
+                    context,
+                    R.drawable.mozac_ic_translate_24,
+                ),
+                contentDescription = context.getString(R.string.browser_toolbar_translate),
+                iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
+                visible = { translationsAvailable },
+                weight = { TRANSLATIONS_WEIGHT },
+                listener = {
+                    browserToolbarInteractor.onTranslationsButtonClicked()
+                },
+            )
+        } else {
+            null
+        }
+
+        translationsAction?.let {
+            (browserToolbarView as BrowserToolbarView).toolbar.addPageAction(it)
+        }
 
         translationsBinding.set(
             feature = TranslationsBinding(
                 browserStore = context.components.core.store,
                 onTranslationStatusUpdate = {
                     translationsAvailable = it.isTranslationPossible
 
-                    translationsAction.updateView(
-                        tintColorResource = if (it.isTranslated) {
-                            R.color.fx_mobile_icon_color_accent_violet
-                        } else {
-                            ThemeManager.resolveAttribute(R.attr.textPrimary, context)
-                        },
-                        contentDescription = if (it.isTranslated) {
-                            context.getString(
-                                R.string.browser_toolbar_translated_successfully,
-                                it.fromSelectedLanguage?.localizedDisplayName,
-                                it.toSelectedLanguage?.localizedDisplayName,
-                            )
-                        } else {
-                            context.getString(R.string.browser_toolbar_translate)
-                        },
-                    )
+                    translationsAction?.let { action ->
+                        action.updateView(
+                            tintColorResource = if (it.isTranslated) {
+                                R.color.fx_mobile_icon_color_accent_violet
+                            } else {
+                                ThemeManager.resolveAttribute(R.attr.textPrimary, context)
+                            },
+                            contentDescription = if (it.isTranslated) {
+                                context.getString(
+                                    R.string.browser_toolbar_translated_successfully,
+                                    it.fromSelectedLanguage?.localizedDisplayName,
+                                    it.toSelectedLanguage?.localizedDisplayName,
+                                )
+                            } else {
+                                context.getString(R.string.browser_toolbar_translate)
+                            },
+                        )
 
-                    safeInvalidateBrowserToolbarView()
+                        safeInvalidateBrowserToolbarView()
+                    }
 
                     if (!it.isTranslateProcessing) {
                         requireComponents.appStore.dispatch(SnackbarAction.SnackbarDismissed)

app/src/main/java/org/mozilla/fenix/components/menu/middleware/MenuTelemetryMiddleware.kt

@@ -138,10 +138,46 @@ class MenuTelemetryMiddleware(
                 ),
             )
 
+            is MenuAction.Navigate.Back -> Events.browserMenuAction.record(
+                Events.BrowserMenuActionExtra(
+                    item = when {
+                        action.viewHistory && accessPoint == MenuAccessPoint.External ->
+                            "custom_back_long_press"
+                        action.viewHistory -> "back_long_press"
+                        accessPoint == MenuAccessPoint.External -> "custom_back"
+                        else -> "back"
+                    },
+                ),
+            )
+
+            is MenuAction.Navigate.Forward -> Events.browserMenuAction.record(
+                Events.BrowserMenuActionExtra(
+                    item = when {
+                        action.viewHistory && accessPoint == MenuAccessPoint.External ->
+                            "custom_forward_long_press"
+                        action.viewHistory -> "forward_long_press"
+                        accessPoint == MenuAccessPoint.External -> "custom_forward"
+                        else -> "forward"
+                    },
+                ),
+            )
+
+            is MenuAction.Navigate.Reload -> Events.browserMenuAction.record(
+                Events.BrowserMenuActionExtra(
+                    item = "reload",
+                ),
+            )
+
+            is MenuAction.Navigate.Stop -> Events.browserMenuAction.record(
+                Events.BrowserMenuActionExtra(
+                    item = "stop",
+                ),
+            )
+
             MenuAction.Navigate.Share -> Events.browserMenuAction.record(
                 Events.BrowserMenuActionExtra(
                     item = when (accessPoint) {
-                        MenuAccessPoint.External -> "share_custom_tab"
+                        MenuAccessPoint.External -> "custom_share"
                         else -> "share"
                     },
                 ),
@@ -166,7 +202,7 @@ class MenuTelemetryMiddleware(
             MenuAction.FindInPage -> Events.browserMenuAction.record(
                 Events.BrowserMenuActionExtra(
                     item = when (accessPoint) {
-                        MenuAccessPoint.External -> "find_in_page_custom_tab"
+                        MenuAccessPoint.External -> "custom_find_in_page"
                         else -> "find_in_page"
                     },
                 ),
@@ -199,7 +235,7 @@ class MenuTelemetryMiddleware(
             is MenuAction.RequestDesktopSite -> Events.browserMenuAction.record(
                 Events.BrowserMenuActionExtra(
                     item = when (accessPoint) {
-                        MenuAccessPoint.External -> "desktop_view_on_custom_tab"
+                        MenuAccessPoint.External -> "custom_desktop_view_on"
                         else -> "desktop_view_on"
                     },
                 ),
@@ -208,7 +244,7 @@ class MenuTelemetryMiddleware(
             is MenuAction.RequestMobileSite -> Events.browserMenuAction.record(
                 Events.BrowserMenuActionExtra(
                     item = when (accessPoint) {
-                        MenuAccessPoint.External -> "desktop_view_off_custom_tab"
+                        MenuAccessPoint.External -> "custom_desktop_view_off"
                         else -> "desktop_view_off"
                     },
                 ),
@@ -252,6 +288,14 @@ class MenuTelemetryMiddleware(
                 )
             }
 
+            is MenuAction.Navigate.InstalledAddonDetails -> {
+                Events.browserMenuAction.record(
+                    Events.BrowserMenuActionExtra(
+                        item = "installed_addon_details",
+                    ),
+                )
+            }
+
             is MenuAction.Navigate.WebCompatReporter -> {
                 Events.browserMenuAction.record(
                     Events.BrowserMenuActionExtra(
@@ -285,11 +329,6 @@ class MenuTelemetryMiddleware(
             is MenuAction.UpdateShowDisabledExtensionsOnboarding,
             is MenuAction.UpdateManageExtensionsMenuItemVisibility,
             is MenuAction.UpdateAvailableAddons,
-            is MenuAction.Navigate.Back,
-            is MenuAction.Navigate.Forward,
-            is MenuAction.Navigate.Reload,
-            is MenuAction.Navigate.Stop,
-            is MenuAction.Navigate.InstalledAddonDetails,
             -> Unit
         }
     }

app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt

@@ -17,6 +17,10 @@ private class DummyProperty : ReadWriteProperty<PreferencesHolder, Boolean> {
 
 /**
  * Property delegate for getting and setting a boolean shared preference gated by a feature flag.
+ *
+ * @param key Key for the shared preference.
+ * @param default Default value to return.
+ * @param featureFlag If true, returns the shared preference value. If false, returns false.
  */
 fun featureFlagPreference(key: String, default: Boolean, featureFlag: Boolean) =
     if (featureFlag) {
@@ -37,6 +41,10 @@ private class LazyPreference(val key: String, val default: () -> Boolean) :
 
 /**
  * Property delegate for getting and setting lazily a boolean shared preference gated by a feature flag.
+ *
+ * @param key Key for the shared preference.
+ * @param featureFlag If true, returns the shared preference value. If false, returns false.
+ * @param default Default value to return.
  */
 fun lazyFeatureFlagPreference(key: String, featureFlag: Boolean, default: () -> Boolean) =
     if (featureFlag) {