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

fork-maintainers · Jun 11, 2024 · cb7fc05 · cb7fc05
2 parents ca2edd4 + 7fda800
commit cb7fc05
Show file tree

Hide file tree

Showing 343 changed files with 13,591 additions and 8,173 deletions.
diff --git a/android-components b/android-components
diff --git a/app/build.gradle b/app/build.gradle
@@ -721,8 +721,8 @@ dependencies {
     implementation FenixDependencies.androidx_core_splashscreen
     implementation FenixDependencies.androidx_transition
     implementation ComponentsDependencies.androidx_work_runtime
-    implementation FenixDependencies.androidx_datastore
-    implementation ComponentsDependencies.androidx_data_store_preferences
+    implementation ComponentsDependencies.androidx_datastore
+    implementation ComponentsDependencies.androidx_datastore_preferences
     implementation FenixDependencies.protobuf_javalite
     implementation ComponentsDependencies.google_material
 
@@ -926,15 +926,10 @@ if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcd
     if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopobjdir')) {
         ext.topobjdir = gradle."localProperties.dependencySubstitutions.geckoviewTopobjdir"
     }
-    ext.topsrcdir = StringUtils.removeSuffix(gradle."localProperties.dependencySubstitutions.geckoviewTopsrcdir", File.separator)
+    ext.topsrcdir = gradle."localProperties.dependencySubstitutions.geckoviewTopsrcdir"
     apply from: "${topsrcdir}/substitute-local-geckoview.gradle"
 }
 
-if (gradle.hasProperty('localProperties.autoPublish.glean.dir')) {
-    ext.gleanSrcDir = gradle."localProperties.autoPublish.glean.dir"
-    apply from: "../${gleanSrcDir}/build-scripts/substitute-local-glean.gradle"
-}
-
 android.applicationVariants.configureEach { variant ->
     tasks.register("apkSize${variant.name.capitalize()}", ApkSizeTask) {
         variantName = variant.name

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
@@ -155,28 +155,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
-        errorLine1="        android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_tab_2&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/debug/res/xml/shortcuts.xml"
-            line="12"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
-        errorLine1="        android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_tab_2&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/xml/shortcuts.xml"
-            line="12"
-            column="9"/>
-    </issue>
-
     <issue
         id="UnusedAttribute"
         message="Attribute `shortcutId` is only used in API level 25 and higher (current min is 21)"
@@ -221,28 +199,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
-        errorLine1="        android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_private_tab_2&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/debug/res/xml/shortcuts.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
-        errorLine1="        android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_private_tab_2&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/xml/shortcuts.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
     <issue
         id="UnusedAttribute"
         message="Attribute `android:foreground` has no effect on API levels lower than 23 (current min is 21)"
@@ -1370,4 +1326,9 @@
             column="21"/>
     </issue>
 
+    <issue id="UnusedResources"
+        message="The resource R.drawable.microsurvey_success appears to be unused">
+        <location file="src/main/res/drawable/microsurvey_success.xml" />
+    </issue>
+
 </issues>
diff --git a/app/messaging-fenix.fml.yaml b/app/messaging-fenix.fml.yaml
@@ -44,6 +44,9 @@ import:
               INACTIVE_4_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 4"
               INACTIVE_5_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 5"
 
+              # Behavioral Targeting Events
+              RECENTLY_PRINTED:  "'print_tapped'|eventLastSeen('Hours') <= 24"
+
               # 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"
@@ -94,10 +97,14 @@ import:
               NOTIFICATION:
                 priority: 50
                 max-display-count: 1
+              MICRO_SURVEY:
+                priority: 50
+                max-display-count: 5
             $$surfaces:
               - homescreen
               - notification
               - survey
+              - microsurvey
 
         - channel: developer
           value:

diff --git a/app/metrics.yaml b/app/metrics.yaml
@@ -868,11 +868,12 @@ translations:
           A string containing the name of the item the user tapped. These items
           include:
           main_flow_toolbar, main_flow_browser, page_settings, global_settings,
-          global_lang_settings, global_site_settings, downloads
+          global_lang_settings, global_site_settings, downloads, global_settings_from_preferences
         type: string
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1883968
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1886851
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1890838
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1883968#c6
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1886851#c8
@@ -2826,11 +2827,11 @@ customize_home:
     notification_emails:
       - android-probes@mozilla.com
     expires: never
-  recently_saved:
+  bookmarks:
     type: boolean
     description: |
       An indication of whether the recently
-      saved section is enabled to be displayed
+      saved section is enabled to be displayed. This was previously customize_home.recently_saved.
     send_in_pings:
       - metrics
     bugs:
@@ -2936,7 +2937,8 @@ customize_home:
           toggled.
 
           We currently track: most_visited_sites, jump_back_in,
-          recently_visited, recently_saved, pocket, and contile.
+          recently_visited, bookmarks, pocket, and contile.
+          We previously tracked bookmarks as recently_saved.
       enabled:
         type: boolean
         description: "Whether or not the preference is *now* enabled"
@@ -9892,11 +9894,11 @@ recent_tabs:
       - android-probes@mozilla.com
     expires: never
 
-recent_bookmarks:
+home_bookmarks:
   shown:
     type: event
     description: |
-      Recent bookmarks section was shown to the user.
+      Bookmarks section of home was shown to the user. This was previously recent_bookmarks.shown.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/22103
     data_reviews:
@@ -9913,8 +9915,8 @@ recent_bookmarks:
     lifetime: application
     description: |
       A counter that indicates the number of times that a user
-      has clicked on a recently saved bookmark from the home
-      screen.
+      has clicked on a bookmark from the home
+      screen. This was previously recent_bookmarks.bookmark_clicked.
     send_in_pings:
       - metrics
     bugs:
@@ -9934,8 +9936,8 @@ recent_bookmarks:
     lifetime: application
     description: |
       A counter that indicates the number of times that a user
-      has clicked the show all button for recently saved bookmarks
-      on the home screen.
+      has clicked the show all button for bookmarks
+      on the home screen. This was previously recent_bookmarks.show_all_bookmarks.
     send_in_pings:
       - metrics
     bugs:
@@ -9950,11 +9952,11 @@ recent_bookmarks:
     notification_emails:
       - android-probes@mozilla.com
     expires: never
-  recent_bookmarks_count:
+  bookmarks_count:
     type: quantity
     description: |
       The number of bookmarked items appearing in the
-      Recently Saved section on the home page.
+      Bookmarks section on the home page. This was previously recent_bookmarks.recent_bookmarks_count.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/22075
     data_reviews:
@@ -11587,6 +11589,29 @@ debug_drawer:
       - android-probes@mozilla.com
     expires: never
 
+micro_survey:
+  response:
+    type: event
+    description: User response data for a micro survey.
+    extra_keys:
+      feature_name:
+        description: The name of the feature the survey is for e.g. "printing PDF".
+        type: string
+      user_selection:
+        description: |
+          The users selected option. For example, possible values are:
+          "Very satisfied", "satisfied", "neutral", "dissatisfied" and "Very dissatisfied".
+        type: string
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1891509
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1891509
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: never
+
 navigation_bar:
   home_search_tapped:
     type: event

diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
@@ -55,7 +55,7 @@ features:
           {
             "top-sites": true,
             "jump-back-in": true,
-            "recently-saved": true,
+            "bookmarks": true,
             "recent-explorations": true,
             "pocket": true,
             "pocket-sponsored-stories": true,
@@ -66,7 +66,7 @@ features:
           "sections-enabled": {
             "top-sites": true,
             "jump-back-in": true,
-            "recently-saved": true,
+            "bookmarks": true,
             "recent-explorations": true,
             "pocket": true,
           }
@@ -250,6 +250,7 @@ features:
 
   glean:
     description: "A feature that provides server-side configurations for Glean metrics (aka Server Knobs)."
+    allow-coenrollment: true
     variables:
       metrics-enabled:
         description: "A map of metric base-identifiers to booleans representing the state of the 'enabled' flag for that metric."
@@ -259,6 +260,10 @@ features:
         description: "Enables precise event timestamps for Glean events"
         type: Boolean
         default: false
+      delay-ping-lifetime-io:
+        description: "Glean will delay io for ping lifetime metrics"
+        type: Boolean
+        default: true
 
   splash-screen:
     description: "A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run."
@@ -437,6 +442,20 @@ features:
         value:
           enabled: true
 
+  remote-tab-management:
+    description: >
+      Features that let users manage tabs on other devices that are
+      connected to the same Mozilla account.
+    variables:
+      close-tabs-enabled:
+        description: >
+          Whether the feature to close synced tabs is enabled. When enabled,
+          this device will allow other devices to close tabs that are open on this device, and
+          show a "close" button for tabs that are currently open on other supported devices
+          in the synced tabs tray.
+        type: Boolean
+        default: false
+
 types:
   objects: {}
 
@@ -446,8 +465,8 @@ types:
       variants:
         top-sites:
           description: The frecency and pinned sites.
-        recently-saved:
-          description: The sites the user has bookmarked recently.
+        bookmarks:
+          description: The sites the user has bookmarked.
         jump-back-in:
           description: The tabs the user was looking immediately before being interrupted.
         recent-explorations:

diff --git a/app/src/androidTest/assets/pages/addressForm.html b/app/src/androidTest/assets/pages/addressForm.html
@@ -1,17 +1,17 @@
 <html>
-<head>
-    <meta name="viewport" content="width=device-width">
+  <head>
+    <meta name="viewport" content="width=device-width" />
     <title>Address_Form</title>
-</head>
-<body>
+  </head>
+  <body>
     <form>
-        <p>Street Address: <input id="streetAddress" type="text"></p>
-        <p>City: <input id="city" type="text"></p>
-        <p>Zip Code: <input id="zipCode" type="text"></p>
-        <p>Country: <input id="country" type="text"></p>
-        <p>Telephone: <input id="telephone" type="text"></p>
-        <p>Email: <input id="email" type="text"></p>
-        <p>Apartment, suite, etc. <input id="apartment" type="text"></p>
+      <p>Street Address: <input id="streetAddress" type="text" /></p>
+      <p>City: <input id="city" type="text" /></p>
+      <p>Zip Code: <input id="zipCode" type="text" /></p>
+      <p>Country: <input id="country" type="text" /></p>
+      <p>Telephone: <input id="telephone" type="text" /></p>
+      <p>Email: <input id="email" type="text" /></p>
+      <p>Apartment, suite, etc. <input id="apartment" type="text" /></p>
     </form>
-</body>
+  </body>
 </html>
diff --git a/app/src/androidTest/assets/pages/audioMediaPage.html b/app/src/androidTest/assets/pages/audioMediaPage.html
@@ -1,13 +1,13 @@
 <html>
-<head>
+  <head>
     <title>Audio_Test_Page</title>
-</head>
-<body>
-<p id="testContent">Page content: audio player</p>
-<div class="audioPlayer">
-    <audio id="audioSample" controls loop>
-        <source src="../resources/audioSample.mp3">
-    </audio>
-</div>
-</body>
+  </head>
+  <body>
+    <p id="testContent">Page content: audio player</p>
+    <div class="audioPlayer">
+      <audio id="audioSample" controls loop>
+        <source src="../resources/audioSample.mp3" />
+      </audio>
+    </div>
+  </body>
 </html>