From b14debb4ac8dde92354ffc167b16191d24c93248 Mon Sep 17 00:00:00 2001 From: jdorweiler Date: Mon, 3 Feb 2025 10:19:16 -0700 Subject: [PATCH] merge main --- overrides/android-override.json | 180 ++++++++++++++++++++++++++++---- 1 file changed, 158 insertions(+), 22 deletions(-) diff --git a/overrides/android-override.json b/overrides/android-override.json index c0fcca9b..b733b98e 100644 --- a/overrides/android-override.json +++ b/overrides/android-override.json @@ -5,7 +5,15 @@ "exceptions": [], "features": { "experimentTestAA": { - "state": "disabled", + "state": "enabled", + "minSupportedVersion": 52240000, + "rollout": { + "steps": [ + { + "percent": 20 + } + ] + }, "cohorts": [ { "name": "control", @@ -31,17 +39,11 @@ "state": "enabled", "exceptions": [], "settings": { - "origins": [ - "funnel_pro_androidrmf_announcement_privacy", - "funnel_pro_androidrmf_announcement_vpn", - "funnel_pro_androidrmf_announcement_holiday", - "funnel_pro_androidrmf_announcement_wifi", - "funnel_pro_androidrmf_announcement" - ] + "origins": [] }, "minSupportedVersion": 52100000 }, - "appTrackerProtection": + "appTrackerProtection": { "state": "enabled" }, "blockList": { @@ -149,7 +151,7 @@ ] }, "tdsNextExperimentBaselineBackup2": { - "state": "enabled", + "state": "disabled", "minSupportedVersion": 52220000, "rollout": { "steps": [ @@ -165,14 +167,14 @@ "cohorts": [ { "name": "control", - "weight": 1 + "weight": 0 }, { "name": "treatment", - "weight": 1 + "weight": 0 } ] - }, + } "tdsNextExperimentBaselineBackup3": { "state": "enabled", "minSupportedVersion": 52240000, @@ -566,17 +568,72 @@ "versions": [ { "appVersion": 52210000, - "daysAfterBuild": 6, + "daysUntilLoggingStarts": 6, "daysLogging": 10, "featuresLogged": { "gpc": true, "cpm": true, - "appTp": false, + "appTP": false, + "netP": false + } + }, + { + "appVersion": 52220000, + "daysUntilLoggingStarts": 6, + "daysLogging": 28, + "featuresLogged": { + "gpc": false, + "cpm": false, + "appTP": true, + "netP": false + } + }, + { + "appVersion": 52230000, + "daysUntilLoggingStarts": 6, + "daysLogging": 10, + "featuresLogged": { + "gpc": false, + "cpm": true, + "appTP": false, + "netP": false + } + }, + { + "appVersion": 52231000, + "daysUntilLoggingStarts": 6, + "daysLogging": 10, + "featuresLogged": { + "gpc": false, + "cpm": true, + "appTP": false, + "netP": false + } + }, + { + "appVersion": 52240000, + "daysUntilLoggingStarts": 6, + "daysLogging": 10, + "featuresLogged": { + "gpc": false, + "cpm": true, + "appTP": false, "netP": false } } ] } + }, + "webLocalStorage": { + "state": "internal", + "settings": { + "domains": ["duckduckgo.com"], + "matchingRegex": [ + "^_https://([a-zA-Z0-9.-]+\\.)?{domain}\u0000\u0001.+$", + "^META:https://([a-zA-Z0-9.-]+\\.)?{domain}$", + "^METAACCESS:https://([a-zA-Z0-9.-]+\\.)?{domain}$" + ] + } } } }, @@ -706,6 +763,10 @@ { "domain": "chewy.com", "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2154" + }, + { + "domain": "hyatt.com", + "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2637" } ] }, @@ -947,6 +1008,10 @@ { "domain": "instagram.com", "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2182" + }, + { + "domain": "hyatt.com", + "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2613" } ], "state": "enabled", @@ -1478,6 +1543,14 @@ { "domain": "thrifty.com", "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2527" + }, + { + "domain": "login.coinbase.com", + "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2660" + }, + { + "domain": "identity.docusign.net", + "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2660" } ] }, @@ -1508,7 +1581,21 @@ "minSupportedVersion": 51961000 }, "isLaunchedROW": { - "state": "disabled" + "state": "enabled", + "rollout": { + "steps": [ + { + "percent": 25 + }, + { + "percent": 50 + }, + { + "percent": 100 + } + ] + }, + "minSupportedVersion": 52220000 }, "allowPurchase": { "state": "enabled" @@ -1556,10 +1643,16 @@ "state": "disabled" }, "privacyProCta": { - "state": "enabled" + "state": "enabled", + "targets": [ + { + "localeLanguage": "en", + "localeCountry": "us" + } + ] }, "testPrivacyProOnboardingCopyNov24": { - "state": "enabled", + "state": "disabled", "description": "copy test in privacy pro onboarding dialog", "targets": [ { @@ -1571,19 +1664,19 @@ "cohorts": [ { "name": "control", - "weight": 1 + "weight": 0 }, { "name": "protection", - "weight": 1 + "weight": 0 }, { "name": "deal", - "weight": 1 + "weight": 0 }, { "name": "step", - "weight": 1 + "weight": 0 } ] } @@ -1675,6 +1768,14 @@ "showOnAppLaunch": { "state": "enabled" }, + "tabManager": { + "state": "internal", + "features": { + "multiSelection": { + "state": "disabled" + } + } + }, "maliciousSiteProtection": { "state": "internal", "settings": { @@ -1682,6 +1783,36 @@ "filterSetUpdateFrequency": 720 }, "exceptions": [] + }, + "bookmarksSorting": { + "state": "disabled" + }, + "settingsPage": { + "state": "enabled", + "features": { + "newSettingsPage": { + "state": "enabled", + "minSupportedVersion": 52250000, + "rollout": { + "steps": [ + { + "percent": 20 + } + ] + } + }, + "newPrivacyProSection": { + "state": "enabled", + "minSupportedVersion": 52250000, + "rollout": { + "steps": [ + { + "percent": 20 + } + ] + } + } + } } }, "unprotectedTemporary": [], @@ -1706,6 +1837,11 @@ "desc": "Highlights onboarding experimental group", "variantKey": "mx", "weight": 0 + }, + { + "desc": "Aura experimental group", + "variantKey": "mq", + "weight": 0 } ] }