From 3fefbb0f02e60d88850d394e56cb6bf34d00c10b Mon Sep 17 00:00:00 2001 From: JohanLorenzo Date: Tue, 23 Jan 2024 19:32:10 +0000 Subject: [PATCH 1/3] Update Fenix initial_experiments.json based on the current first-run experiments in experimenter (cherry picked from commit 28f0fab2427aef40b010d4471eac45dee6348d56) --- app/src/main/res/raw/initial_experiments.json | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json index a28f39a84..d101bbd3e 100644 --- a/app/src/main/res/raw/initial_experiments.json +++ b/app/src/main/res/raw/initial_experiments.json @@ -56,6 +56,174 @@ "localizations": null, "locales": null }, + { + "schemaVersion": "1.12.0", + "slug": "beta-fx-122-android-set-to-default-notifications-timing-experiment", + "id": "beta-fx-122-android-set-to-default-notifications-timing-experiment", + "arguments": {}, + "application": "org.mozilla.firefox", + "appName": "fenix", + "appId": "org.mozilla.firefox", + "channel": "release", + "userFacingName": "Fx 122 Android set to default notifications timing experiment", + "userFacingDescription": "Timing test for the set to default message on Firefox for Android (Fenix).", + "isEnrollmentPaused": false, + "isRollout": false, + "bucketConfig": { + "randomizationUnit": "nimbus_id", + "namespace": "fenix-messaging-release-19", + "start": 0, + "count": 10000, + "total": 10000 + }, + "featureIds": [ + "messaging" + ], + "probeSets": [], + "outcomes": [ + { + "slug": "default-browser", + "priority": "primary" + } + ], + "branches": [ + { + "slug": "control", + "ratio": 1, + "feature": { + "featureId": "this-is-included-for-mobile-pre-96-support", + "enabled": false, + "value": {} + }, + "features": [ + { + "featureId": "messaging", + "enabled": true, + "value": { + "messages": { + "{experiment}-en": { + "is-control": true, + "surface": "notification", + "style": "NOTIFICATION", + "action": "MAKE_DEFAULT_BROWSER", + "trigger": [ + "I_AM_NOT_DEFAULT_BROWSER" + ], + "experiment": "{experiment}" + } + } + } + } + ] + }, + { + "slug": "treatment-a", + "ratio": 1, + "feature": { + "featureId": "this-is-included-for-mobile-pre-96-support", + "enabled": false, + "value": {} + }, + "features": [ + { + "featureId": "messaging", + "enabled": true, + "value": { + "messages": { + "{experiment}-en": { + "title": "Firefox is Fast and Private", + "text": "Make Firefox your default browser", + "surface": "notification", + "style": "NOTIFICATION", + "action": "MAKE_DEFAULT_BROWSER", + "trigger": [ + "DAY_1_AFTER_INSTALL", + "I_AM_NOT_DEFAULT_BROWSER" + ], + "experiment": "{experiment}" + } + } + } + } + ] + }, + { + "slug": "treatment-b", + "ratio": 1, + "feature": { + "featureId": "this-is-included-for-mobile-pre-96-support", + "enabled": false, + "value": {} + }, + "features": [ + { + "featureId": "messaging", + "enabled": true, + "value": { + "messages": { + "{experiment}-en": { + "title": "Firefox is Fast and Private", + "text": "Make Firefox your default browser", + "surface": "notification", + "style": "NOTIFICATION", + "action": "MAKE_DEFAULT_BROWSER", + "trigger": [ + "DAY_3_AFTER_INSTALL", + "I_AM_NOT_DEFAULT_BROWSER" + ], + "experiment": "{experiment}" + } + } + } + } + ] + }, + { + "slug": "treatment-c", + "ratio": 1, + "feature": { + "featureId": "this-is-included-for-mobile-pre-96-support", + "enabled": false, + "value": {} + }, + "features": [ + { + "featureId": "messaging", + "enabled": true, + "value": { + "messages": { + "{experiment}-en": { + "title": "Firefox is Fast and Private", + "text": "Make Firefox your default browser", + "surface": "notification", + "style": "NOTIFICATION", + "action": "MAKE_DEFAULT_BROWSER", + "trigger": [ + "DAY_6_AFTER_INSTALL", + "I_AM_NOT_DEFAULT_BROWSER" + ], + "experiment": "{experiment}" + } + }, + "triggers": { + "DAY_6_AFTER_INSTALL": "days_since_install == 6" + } + } + } + ] + } + ], + "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('122.!') >= 0) && (language in ['en'])))", + "startDate": "2024-01-23", + "enrollmentEndDate": null, + "endDate": null, + "proposedDuration": 43, + "proposedEnrollment": 14, + "referenceBranch": "control", + "featureValidationOptOut": false, + "localizations": null, + "locales": null + }, { "schemaVersion": "1.12.0", "slug": "splash-screen-test", From d8cd5795fafdf2bf22df78a7f4093d75c0e5e5b2 Mon Sep 17 00:00:00 2001 From: DreVla Date: Mon, 22 Jan 2024 11:58:16 +0200 Subject: [PATCH 2/3] Bug 1861744 - Don't display pending to delete bookmarks when refresh When deleting bookmarks, we do not instantly remove them due to having the possibility of undoing the deletion. Because of this, when the bookmarks are pending to delete, they can still be displayed when pulling down to refresh and then acted on. This patch aims to fix this issue by subtracting the pending to delete bookmarks when they are refreshed by pulling down. (cherry picked from commit b98eea7fdc7901b1df91dcf796635a25cbe22900) --- .../java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 2108dc143..466467589 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -281,6 +281,7 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan context?.let { requireContext().bookmarkStorage .getTree(guid, recursive) + ?.minus(pendingBookmarksToDelete) ?.let { desktopFolders.withOptionalDesktopFolders(it) } } } From 62566e6db6d80224ebc2914e04d8af6c1337aa93 Mon Sep 17 00:00:00 2001 From: "oana.horvath" Date: Wed, 17 Jan 2024 12:35:34 +0200 Subject: [PATCH 3/3] Bug 1842154 - Disable notificationCanBeDismissedIfDownloadIsInterruptedTest UI test (cherry picked from commit 9239d5d697cbda680aa768d56a51b6981e60398d) --- app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt index b5ca7b109..987660636 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt @@ -277,6 +277,7 @@ class DownloadTest { } // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2299297 + @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1842154") @Test fun notificationCanBeDismissedIfDownloadIsInterruptedTest() { downloadRobot {