Merge remote-tracking branch 'origin/fenix/122.0' into iceraven

app/build.gradle

@@ -198,6 +198,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     androidResources {
@@ -273,6 +274,9 @@ android {
             excludes += ['META-INF/atomicfu.kotlin_module', 'META-INF/AL2.0', 'META-INF/LGPL2.1',
                          'META-INF/LICENSE.md', 'META-INF/LICENSE-notice.md']
         }
+        jniLibs {
+            useLegacyPackaging true
+        }
     }
 
 
@@ -780,14 +784,14 @@ if (project.hasProperty("coverage")) {
 
             def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*',
                               '**/*Test*.*', 'android/**/*.*', '**/*$[0-9].*']
-            def kotlinDebugTree = fileTree(dir: "$project.buildDir/tmp/kotlin-classes/${variant.name}", excludes: fileFilter)
-            def javaDebugTree = fileTree(dir: "$project.buildDir/intermediates/classes/${variant.flavorName}/${variant.buildType.name}",
+            def kotlinDebugTree = fileTree(dir: "$project.layout.buildDirectory/tmp/kotlin-classes/${variant.name}", excludes: fileFilter)
+            def javaDebugTree = fileTree(dir: "$project.layout.buildDirectory/intermediates/classes/${variant.flavorName}/${variant.buildType.name}",
                     excludes: fileFilter)
             def mainSrc = "$project.projectDir/src/main/java"
 
             sourceDirectories.setFrom(files([mainSrc]))
             classDirectories.setFrom(files([kotlinDebugTree, javaDebugTree]))
-            executionData.setFrom(fileTree(dir: project.buildDir, includes: [
+            executionData.setFrom(fileTree(dir: project.layout.buildDirectory, includes: [
                 "jacoco/test${variant.name.capitalize()}UnitTest.exec",
                 'outputs/code-coverage/connected/*coverage.ec'
             ]))

app/messaging-evergreen-messages.fml.yaml

@@ -0,0 +1,52 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+# This file configures "evergreen" messages that are displayed via
+# the Nimbus Messaging system.
+#
+# They are "evergreen" in that they apply to all users, and shipped with the app.
+#
+# This file is intended to grow new messages once messages have been tested via
+# experiment, rolled out to everyone in the release, and are ready to be rolled out
+# without the remote prompting from Experimenter.
+#
+# When adding new messages to this file, please add the experiment (and/or rollout) URLs used to
+# validate them.
+#
+# Triggers, actions and styles are configured in messaging-fenix.fml.yaml.
+import:
+  - path: ../android-components/components/service/nimbus/messaging.fml.yaml
+    channel: release
+    features:
+      messaging:
+        # This message displays on the homescreen, asking the user to set Firefox as the default.
+        # It is triggered after a minimum of 4 launches of the app.
+        - value:
+            messages:
+              default-browser:
+                text: default_browser_experiment_card_text
+                surface: homescreen
+                action: "MAKE_DEFAULT_BROWSER"
+                trigger:
+                  - I_AM_NOT_DEFAULT_BROWSER
+                  - USER_ESTABLISHED_INSTALL
+                style: PERSISTENT
+                button-label: preferences_set_as_default_browser
+
+            triggers:
+              USER_ESTABLISHED_INSTALL: "number_of_app_launches >=4"
+
+        # This message displays as a 'push' notification, asking the user to set Firefox as the default.
+        # It is triggered three days after install.
+        - value:
+            messages:
+              default-browser-notification:
+                title: nimbus_notification_default_browser_title
+                text: nimbus_notification_default_browser_text
+                surface: notification
+                style: NOTIFICATION
+                trigger:
+                  - I_AM_NOT_DEFAULT_BROWSER
+                  - DAY_3_AFTER_INSTALL
+                action: MAKE_DEFAULT_BROWSER

app/messaging-fenix.fml.yaml

@@ -0,0 +1,112 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+includes:
+  - messaging-evergreen-messages.fml.yaml
+import:
+  - path: ../android-components/components/service/nimbus/messaging.fml.yaml
+    channel: release
+    features:
+      messaging:
+        - value:
+            triggers:
+              # Using attributes built into the Nimbus SDK
+              USER_RECENTLY_INSTALLED: days_since_install < 7
+              USER_RECENTLY_UPDATED: days_since_update < 7 && days_since_install != days_since_update
+              USER_TIER_ONE_COUNTRY: ('US' in locale || 'GB' in locale || 'CA' in locale || 'DE' in locale || 'FR' in locale)
+              USER_EN_SPEAKER: "'en' in locale"
+              USER_ES_SPEAKER: "'es' in locale"
+              USER_DE_SPEAKER: "'de' in locale"
+              USER_FR_SPEAKER: "'fr' in locale"
+              DEVICE_ANDROID: os == 'Android'
+              DEVICE_IOS: os == 'iOS'
+              ALWAYS: "true"
+              NEVER: "false"
+              DAY_1_AFTER_INSTALL: days_since_install == 1
+              DAY_2_AFTER_INSTALL: days_since_install == 2
+              DAY_3_AFTER_INSTALL: days_since_install == 3
+              DAY_4_AFTER_INSTALL: days_since_install == 4
+              DAY_5_AFTER_INSTALL: days_since_install == 5
+              MORE_THAN_24H_SINCE_INSTALLED_OR_UPDATED: days_since_update >= 1
+
+              # Using custom attributes for the browser
+              I_AM_DEFAULT_BROWSER: "is_default_browser"
+              I_AM_NOT_DEFAULT_BROWSER: "is_default_browser == false"
+
+              FUNNEL_PAID: "adjust_campaign != ''"
+              FUNNEL_ORGANIC: "adjust_campaign == ''"
+
+              # Using Glean events, specific to the browser
+              INACTIVE_1_DAY: "'app_launched'|eventLastSeen('Hours') >= 24"
+              INACTIVE_2_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 2"
+              INACTIVE_3_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 3"
+              INACTIVE_4_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 4"
+              INACTIVE_5_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 5"
+
+              # Has the user signed in the last 4 years
+              FXA_SIGNED_IN: "'sync_auth.sign_in'|eventLastSeen('Years', 0) <= 4"
+              FXA_NOT_SIGNED_IN: "'sync_auth.sign_in'|eventLastSeen('Years', 0) > 4"
+
+              # https://mozilla-hub.atlassian.net/wiki/spaces/FJT/pages/11469471/Core+Active
+              USER_INFREQUENT: "'app_launched'|eventCountNonZero('Days', 28) >= 1 && 'app_launched'|eventCountNonZero('Days', 28) < 7"
+              USER_CASUAL: "'app_launched'|eventCountNonZero('Days', 28) >= 7 && 'app_launched'|eventCountNonZero('Days', 28) < 14"
+              USER_REGULAR: "'app_launched'|eventCountNonZero('Days', 28) >= 14 && 'app_launched'|eventCountNonZero('Days', 28) < 21"
+              USER_CORE_ACTIVE: "'app_launched'|eventCountNonZero('Days', 28) >= 21"
+
+              LAUNCHED_ONCE_THIS_WEEK: "'app_launched'|eventSum('Days', 7) == 1"
+
+            actions:
+              ENABLE_PRIVATE_BROWSING: ://enable_private_browsing
+              INSTALL_SEARCH_WIDGET: ://install_search_widget
+              MAKE_DEFAULT_BROWSER: ://make_default_browser
+              VIEW_BOOKMARKS: ://urls_bookmarks
+              VIEW_COLLECTIONS: ://home_collections
+              VIEW_HISTORY: ://urls_history
+              VIEW_HOMESCREEN: ://home
+              OPEN_SETTINGS_ACCESSIBILITY: ://settings_accessibility
+              OPEN_SETTINGS_ADDON_MANAGER: ://settings_addon_manager
+              OPEN_SETTINGS_DELETE_BROWSING_DATA: ://settings_delete_browsing_data
+              OPEN_SETTINGS_LOGINS: ://settings_logins
+              OPEN_SETTINGS_NOTIFICATIONS: ://settings_notifications
+              OPEN_SETTINGS_PRIVACY: ://settings_privacy
+              OPEN_SETTINGS_SEARCH_ENGINE: ://settings_search_engine
+              OPEN_SETTINGS_TRACKING_PROTECTION: ://settings_tracking_protection
+              OPEN_SETTINGS_WALLPAPERS: ://settings_wallpapers
+              OPEN_SETTINGS: ://settings
+              TURN_ON_SYNC: ://turn_on_sync
+            styles:
+              DEFAULT:
+                priority: 50
+                max-display-count: 5
+              SURVEY:
+                priority: 55
+                max-display-count: 1
+              PERSISTENT:
+                priority: 50
+                max-display-count: 20
+              WARNING:
+                priority: 60
+                max-display-count: 10
+              URGENT:
+                priority: 100
+                max-display-count: 10
+              NOTIFICATION:
+                priority: 50
+                max-display-count: 1
+            $$surfaces:
+              - homescreen
+              - notification
+              - survey
+
+        - channel: developer
+          value:
+            styles:
+              DEFAULT:
+                priority: 50
+                max-display-count: 100
+              EXPIRES_QUICKLY:
+                priority: 100
+                max-display-count: 1
+            notification-config:
+              refresh-interval: 120 # minutes (2 hours)