diff --git a/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml b/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml index d5aeb8144..3d07ebaa8 100644 --- a/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml +++ b/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml @@ -1,3 +1,3 @@ beta: 906cab48c99fff962adacbc8dd2aca416f7aecc6 -main: 31aaa104c99421ced2e674334eef2aa5b7e45b5d +main: 14ed0c687a422c780dc23e579b9c07516f05153f release: 3bf8f468258c2181f455e23d4ffcd6acb8f4cdb1 diff --git a/experimenter/experimenter/features/manifests/fenix/beta.fml.yaml b/experimenter/experimenter/features/manifests/fenix/beta.fml.yaml index fa51073c3..56a37cb4a 100644 --- a/experimenter/experimenter/features/manifests/fenix/beta.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/beta.fml.yaml @@ -1069,7 +1069,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/fenix/developer.fml.yaml b/experimenter/experimenter/features/manifests/fenix/developer.fml.yaml index c7ff5a2a7..722e13278 100644 --- a/experimenter/experimenter/features/manifests/fenix/developer.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/developer.fml.yaml @@ -1089,7 +1089,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/fenix/nightly.fml.yaml b/experimenter/experimenter/features/manifests/fenix/nightly.fml.yaml index e71673894..1c8df923e 100644 --- a/experimenter/experimenter/features/manifests/fenix/nightly.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/nightly.fml.yaml @@ -1115,7 +1115,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/fenix/release.fml.yaml b/experimenter/experimenter/features/manifests/fenix/release.fml.yaml index 599451a9f..8f0b71346 100644 --- a/experimenter/experimenter/features/manifests/fenix/release.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/release.fml.yaml @@ -1069,7 +1069,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/fenix/v158.0.0/beta.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v158.0.0/beta.fml.yaml index fa51073c3..56a37cb4a 100644 --- a/experimenter/experimenter/features/manifests/fenix/v158.0.0/beta.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/v158.0.0/beta.fml.yaml @@ -1069,7 +1069,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/fenix/v158.0.0/developer.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v158.0.0/developer.fml.yaml index c7ff5a2a7..722e13278 100644 --- a/experimenter/experimenter/features/manifests/fenix/v158.0.0/developer.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/v158.0.0/developer.fml.yaml @@ -1089,7 +1089,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/fenix/v158.0.0/nightly.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v158.0.0/nightly.fml.yaml index e71673894..1c8df923e 100644 --- a/experimenter/experimenter/features/manifests/fenix/v158.0.0/nightly.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/v158.0.0/nightly.fml.yaml @@ -1115,7 +1115,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/fenix/v158.0.0/release.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v158.0.0/release.fml.yaml index 599451a9f..8f0b71346 100644 --- a/experimenter/experimenter/features/manifests/fenix/v158.0.0/release.fml.yaml +++ b/experimenter/experimenter/features/manifests/fenix/v158.0.0/release.fml.yaml @@ -1069,7 +1069,7 @@ features: enabled: description: If true, show the expand/collapse buttons on the homepage. type: Boolean - default: false + default: true splash-screen: description: A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run. variables: diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml index 096ae5c9c..bd6e7d48a 100644 --- a/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml +++ b/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml @@ -2,5 +2,5 @@ beta: 906cab48c99fff962adacbc8dd2aca416f7aecc6 esr115: f05e01c0fcdd9e7e4f87213035cb2cf7406bc015 esr128: ed38f9209e39bd7ad247c81a7c20c99c874e0a62 esr140: 8e024eed5b78fc85089e3fb3864db2712a2df018 -main: 57dd70f1e1ff948dd88612dce8c6d4a30af41c0e +main: 14ed0c687a422c780dc23e579b9c07516f05153f release: 3bf8f468258c2181f455e23d4ffcd6acb8f4cdb1 diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml index 0820af1ac..207ff8df7 100644 --- a/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml +++ b/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml @@ -201,7 +201,7 @@ searchConfiguration: type: boolean setPref: branch: user - pref: browser.search.separatePrivateDefault.ui.enabled + pref: browser.search.separatePrivateDefault.featureGate description: Whether the UI for the separate private default feature is enabled. separatePrivateDefaultUrlbarResultEnabled: type: boolean diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json b/experimenter/experimenter/features/manifests/firefox-desktop/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json index 17e5b3895..88a04d061 100644 --- a/experimenter/experimenter/features/manifests/firefox-desktop/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json +++ b/experimenter/experimenter/features/manifests/firefox-desktop/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json @@ -113,472 +113,6 @@ "targeting" ] }, - "CFRUrlbarChiclet": { - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "file:///CFRUrlbarChiclet.schema.json", - "title": "CFRUrlbarChiclet", - "description": "A template with a chiclet button with text.", - "allOf": [ - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/Message" - } - ], - "type": "object", - "properties": { - "content": { - "type": "object", - "properties": { - "category": { - "type": "string", - "description": "Attribute used for different groups of messages from the same provider" - }, - "layout": { - "type": "string", - "description": "Describes how content should be displayed.", - "enum": [ - "chiclet_open_url" - ] - }, - "bucket_id": { - "type": "string", - "description": "A bucket identifier for the addon. This is used in order to anonymize telemetry for history-sensitive targeting." - }, - "notification_text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The text in the small blue chicklet that appears in the URL bar. This can be a reference to a localized string in Firefox or just a plain string." - }, - "active_color": { - "type": "string", - "description": "Background color of the button" - }, - "action": { - "type": "object", - "properties": { - "url": { - "description": "The page to open when the button is clicked.", - "type": "string", - "format": "moz-url-format" - }, - "where": { - "description": "Should it open in a new tab or the current tab", - "type": "string", - "enum": [ - "current", - "tabshifted" - ] - } - }, - "additionalProperties": true, - "required": [ - "url", - "where" - ] - } - }, - "additionalProperties": true, - "required": [ - "layout", - "category", - "bucket_id", - "notification_text", - "action" - ] - }, - "template": { - "type": "string", - "const": "cfr_urlbar_chiclet" - } - }, - "required": [ - "targeting", - "trigger" - ] - }, - "ExtensionDoorhanger": { - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "file:///ExtensionDoorhanger.schema.json", - "title": "ExtensionDoorhanger", - "description": "A template with a heading, addon icon, title and description. No markup allowed.", - "allOf": [ - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/Message" - } - ], - "type": "object", - "properties": { - "content": { - "type": "object", - "properties": { - "category": { - "type": "string", - "description": "Attribute used for different groups of messages from the same provider" - }, - "layout": { - "type": "string", - "description": "Attribute used for different groups of messages from the same provider", - "enum": [ - "short_message", - "icon_and_message", - "addon_recommendation" - ] - }, - "anchor_id": { - "type": "string", - "description": "A DOM element ID that the pop-over will be anchored." - }, - "alt_anchor_id": { - "type": "string", - "description": "An alternate DOM element ID that the pop-over will be anchored." - }, - "bucket_id": { - "type": "string", - "description": "A bucket identifier for the addon. This is used in order to anonymize telemetry for history-sensitive targeting." - }, - "skip_address_bar_notifier": { - "type": "boolean", - "description": "Skip the 'Recommend' notifier and show directly." - }, - "persistent_doorhanger": { - "type": "boolean", - "description": "Prevent the doorhanger from being dismissed if user interacts with the page or switches between applications." - }, - "show_in_private_browsing": { - "type": "boolean", - "description": "Whether to allow the message to be shown in private browsing mode. Defaults to false." - }, - "notification_text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The text in the small blue chicklet that appears in the URL bar. This can be a reference to a localized string in Firefox or just a plain string." - }, - "info_icon": { - "type": "object", - "description": "The small icon displayed in the top right corner of the pop-over. Should be 19x19px, svg or png. Defaults to a small question mark.", - "properties": { - "label": { - "oneOf": [ - { - "type": "object", - "properties": { - "attributes": { - "type": "object", - "properties": { - "tooltiptext": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "Text for button tooltip used to provide information about the doorhanger." - } - }, - "required": [ - "tooltiptext" - ] - } - }, - "required": [ - "attributes" - ] - }, - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizedText" - } - ] - }, - "sumo_path": { - "type": "string", - "description": "Last part of the path in the URL to the support page with the information about the doorhanger.", - "examples": [ - "extensionpromotions", - "extensionrecommendations" - ] - } - } - }, - "learn_more": { - "type": "string", - "description": "Last part of the path in the SUMO URL to the support page with the information about the doorhanger.", - "examples": [ - "extensionpromotions", - "extensionrecommendations" - ] - }, - "heading_text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The larger heading text displayed in the pop-over. This can be a reference to a localized string in Firefox or just a plain string." - }, - "icon": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl", - "description": "The icon displayed in the pop-over. Should be 32x32px or 64x64px and png/svg." - }, - "icon_dark_theme": { - "type": "string", - "description": "Pop-over icon, dark theme variant. Should be 32x32px or 64x64px and png/svg." - }, - "icon_class": { - "type": "string", - "description": "CSS class of the pop-over icon." - }, - "addon": { - "description": "Addon information including AMO URL.", - "type": "object", - "properties": { - "id": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Unique addon ID" - }, - "title": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Addon name" - }, - "author": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Addon author" - }, - "icon": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl", - "description": "The icon displayed in the pop-over. Should be 64x64px and png/svg." - }, - "rating": { - "type": "string", - "description": "Star rating" - }, - "users": { - "type": "string", - "description": "Installed users" - }, - "amo_url": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl", - "description": "Link that offers more information related to the addon." - } - }, - "required": [ - "title", - "author", - "icon", - "amo_url" - ] - }, - "text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The body text displayed in the pop-over. This can be a reference to a localized string in Firefox or just a plain string." - }, - "descriptionDetails": { - "description": "Additional information and steps on how to use", - "type": "object", - "properties": { - "steps": { - "description": "Array of string_ids", - "type": "array", - "items": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizedText", - "description": "Id of string to localized addon description" - } - } - }, - "required": [ - "steps" - ] - }, - "buttons": { - "description": "The label and functionality for the buttons in the pop-over.", - "type": "object", - "properties": { - "primary": { - "type": "object", - "properties": { - "label": { - "type": "object", - "oneOf": [ - { - "properties": { - "value": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Button label override used when a localized version is not available." - }, - "attributes": { - "type": "object", - "properties": { - "accesskey": { - "type": "string", - "description": "A single character to be used as a shortcut key for the secondary button. This should be one of the characters that appears in the button label." - } - }, - "required": [ - "accesskey" - ], - "description": "Button attributes." - } - }, - "required": [ - "value", - "attributes" - ] - }, - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizedText" - } - ], - "description": "Id of localized string or message override." - }, - "action": { - "type": "object", - "properties": { - "type": { - "type": "string", - "description": "Action dispatched by the button." - }, - "data": { - "properties": { - "url": { - "type": "string", - "$comment": "This is dynamically generated from the addon.id. See CFRPageActions.sys.mjs", - "description": "URL used in combination with the primary action dispatched." - } - } - } - } - } - } - }, - "secondary": { - "type": "array", - "items": { - "type": "object", - "properties": { - "label": { - "type": "object", - "oneOf": [ - { - "properties": { - "value": { - "allOf": [ - { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText" - }, - { - "description": "Button label override used when a localized version is not available." - } - ] - }, - "attributes": { - "type": "object", - "properties": { - "accesskey": { - "type": "string", - "description": "A single character to be used as a shortcut key for the secondary button. This should be one of the characters that appears in the button label." - } - }, - "required": [ - "accesskey" - ], - "description": "Button attributes." - } - }, - "required": [ - "value", - "attributes" - ] - }, - { - "properties": { - "string_id": { - "allOf": [ - { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText" - }, - { - "description": "Id of localized string for button" - } - ] - } - }, - "required": [ - "string_id" - ] - } - ], - "description": "Id of localized string or message override." - }, - "action": { - "type": "object", - "properties": { - "type": { - "type": "string", - "description": "Action dispatched by the button." - }, - "data": { - "properties": { - "url": { - "allOf": [ - { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl" - }, - { - "description": "URL used in combination with the primary action dispatched." - } - ] - } - } - } - } - } - } - } - } - } - } - }, - "additionalProperties": true, - "required": [ - "layout", - "bucket_id", - "heading_text", - "text", - "buttons" - ], - "if": { - "properties": { - "skip_address_bar_notifier": { - "anyOf": [ - { - "const": "false" - }, - { - "const": null - } - ] - } - } - }, - "then": { - "required": [ - "category", - "notification_text" - ] - } - }, - "template": { - "type": "string", - "enum": [ - "cfr_doorhanger", - "milestone_message" - ] - } - }, - "additionalProperties": true, - "required": [ - "targeting", - "trigger" - ], - "$defs": { - "plainText": { - "description": "Plain text (no HTML allowed)", - "type": "string" - }, - "linkUrl": { - "description": "Target for links or buttons", - "type": "string", - "format": "uri" - } - } - }, "InfoBar": { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "file:///InfoBar.schema.json", @@ -1880,9 +1414,6 @@ "enum": [ "action_only", "bookmarks_bar_button", - "cfr_urlbar_chiclet", - "cfr_doorhanger", - "milestone_message", "infobar", "menu_message", "pb_newtab", @@ -2068,45 +1599,6 @@ "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/BookmarksBarButton" } }, - { - "if": { - "type": "object", - "properties": { - "template": { - "type": "string", - "enum": [ - "cfr_urlbar_chiclet" - ] - } - }, - "required": [ - "template" - ] - }, - "then": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/CFRUrlbarChiclet" - } - }, - { - "if": { - "type": "object", - "properties": { - "template": { - "type": "string", - "enum": [ - "cfr_doorhanger", - "milestone_message" - ] - } - }, - "required": [ - "template" - ] - }, - "then": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/ExtensionDoorhanger" - } - }, { "if": { "type": "object", diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/experimenter.yaml index 0820af1ac..207ff8df7 100644 --- a/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/experimenter.yaml +++ b/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/experimenter.yaml @@ -201,7 +201,7 @@ searchConfiguration: type: boolean setPref: branch: user - pref: browser.search.separatePrivateDefault.ui.enabled + pref: browser.search.separatePrivateDefault.featureGate description: Whether the UI for the separate private default feature is enabled. separatePrivateDefaultUrlbarResultEnabled: type: boolean diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json b/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json index 17e5b3895..88a04d061 100644 --- a/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json +++ b/experimenter/experimenter/features/manifests/firefox-desktop/v158.0.0/schemas/browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json @@ -113,472 +113,6 @@ "targeting" ] }, - "CFRUrlbarChiclet": { - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "file:///CFRUrlbarChiclet.schema.json", - "title": "CFRUrlbarChiclet", - "description": "A template with a chiclet button with text.", - "allOf": [ - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/Message" - } - ], - "type": "object", - "properties": { - "content": { - "type": "object", - "properties": { - "category": { - "type": "string", - "description": "Attribute used for different groups of messages from the same provider" - }, - "layout": { - "type": "string", - "description": "Describes how content should be displayed.", - "enum": [ - "chiclet_open_url" - ] - }, - "bucket_id": { - "type": "string", - "description": "A bucket identifier for the addon. This is used in order to anonymize telemetry for history-sensitive targeting." - }, - "notification_text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The text in the small blue chicklet that appears in the URL bar. This can be a reference to a localized string in Firefox or just a plain string." - }, - "active_color": { - "type": "string", - "description": "Background color of the button" - }, - "action": { - "type": "object", - "properties": { - "url": { - "description": "The page to open when the button is clicked.", - "type": "string", - "format": "moz-url-format" - }, - "where": { - "description": "Should it open in a new tab or the current tab", - "type": "string", - "enum": [ - "current", - "tabshifted" - ] - } - }, - "additionalProperties": true, - "required": [ - "url", - "where" - ] - } - }, - "additionalProperties": true, - "required": [ - "layout", - "category", - "bucket_id", - "notification_text", - "action" - ] - }, - "template": { - "type": "string", - "const": "cfr_urlbar_chiclet" - } - }, - "required": [ - "targeting", - "trigger" - ] - }, - "ExtensionDoorhanger": { - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "file:///ExtensionDoorhanger.schema.json", - "title": "ExtensionDoorhanger", - "description": "A template with a heading, addon icon, title and description. No markup allowed.", - "allOf": [ - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/Message" - } - ], - "type": "object", - "properties": { - "content": { - "type": "object", - "properties": { - "category": { - "type": "string", - "description": "Attribute used for different groups of messages from the same provider" - }, - "layout": { - "type": "string", - "description": "Attribute used for different groups of messages from the same provider", - "enum": [ - "short_message", - "icon_and_message", - "addon_recommendation" - ] - }, - "anchor_id": { - "type": "string", - "description": "A DOM element ID that the pop-over will be anchored." - }, - "alt_anchor_id": { - "type": "string", - "description": "An alternate DOM element ID that the pop-over will be anchored." - }, - "bucket_id": { - "type": "string", - "description": "A bucket identifier for the addon. This is used in order to anonymize telemetry for history-sensitive targeting." - }, - "skip_address_bar_notifier": { - "type": "boolean", - "description": "Skip the 'Recommend' notifier and show directly." - }, - "persistent_doorhanger": { - "type": "boolean", - "description": "Prevent the doorhanger from being dismissed if user interacts with the page or switches between applications." - }, - "show_in_private_browsing": { - "type": "boolean", - "description": "Whether to allow the message to be shown in private browsing mode. Defaults to false." - }, - "notification_text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The text in the small blue chicklet that appears in the URL bar. This can be a reference to a localized string in Firefox or just a plain string." - }, - "info_icon": { - "type": "object", - "description": "The small icon displayed in the top right corner of the pop-over. Should be 19x19px, svg or png. Defaults to a small question mark.", - "properties": { - "label": { - "oneOf": [ - { - "type": "object", - "properties": { - "attributes": { - "type": "object", - "properties": { - "tooltiptext": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "Text for button tooltip used to provide information about the doorhanger." - } - }, - "required": [ - "tooltiptext" - ] - } - }, - "required": [ - "attributes" - ] - }, - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizedText" - } - ] - }, - "sumo_path": { - "type": "string", - "description": "Last part of the path in the URL to the support page with the information about the doorhanger.", - "examples": [ - "extensionpromotions", - "extensionrecommendations" - ] - } - } - }, - "learn_more": { - "type": "string", - "description": "Last part of the path in the SUMO URL to the support page with the information about the doorhanger.", - "examples": [ - "extensionpromotions", - "extensionrecommendations" - ] - }, - "heading_text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The larger heading text displayed in the pop-over. This can be a reference to a localized string in Firefox or just a plain string." - }, - "icon": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl", - "description": "The icon displayed in the pop-over. Should be 32x32px or 64x64px and png/svg." - }, - "icon_dark_theme": { - "type": "string", - "description": "Pop-over icon, dark theme variant. Should be 32x32px or 64x64px and png/svg." - }, - "icon_class": { - "type": "string", - "description": "CSS class of the pop-over icon." - }, - "addon": { - "description": "Addon information including AMO URL.", - "type": "object", - "properties": { - "id": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Unique addon ID" - }, - "title": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Addon name" - }, - "author": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Addon author" - }, - "icon": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl", - "description": "The icon displayed in the pop-over. Should be 64x64px and png/svg." - }, - "rating": { - "type": "string", - "description": "Star rating" - }, - "users": { - "type": "string", - "description": "Installed users" - }, - "amo_url": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl", - "description": "Link that offers more information related to the addon." - } - }, - "required": [ - "title", - "author", - "icon", - "amo_url" - ] - }, - "text": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizableText", - "description": "The body text displayed in the pop-over. This can be a reference to a localized string in Firefox or just a plain string." - }, - "descriptionDetails": { - "description": "Additional information and steps on how to use", - "type": "object", - "properties": { - "steps": { - "description": "Array of string_ids", - "type": "array", - "items": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizedText", - "description": "Id of string to localized addon description" - } - } - }, - "required": [ - "steps" - ] - }, - "buttons": { - "description": "The label and functionality for the buttons in the pop-over.", - "type": "object", - "properties": { - "primary": { - "type": "object", - "properties": { - "label": { - "type": "object", - "oneOf": [ - { - "properties": { - "value": { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText", - "description": "Button label override used when a localized version is not available." - }, - "attributes": { - "type": "object", - "properties": { - "accesskey": { - "type": "string", - "description": "A single character to be used as a shortcut key for the secondary button. This should be one of the characters that appears in the button label." - } - }, - "required": [ - "accesskey" - ], - "description": "Button attributes." - } - }, - "required": [ - "value", - "attributes" - ] - }, - { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/localizedText" - } - ], - "description": "Id of localized string or message override." - }, - "action": { - "type": "object", - "properties": { - "type": { - "type": "string", - "description": "Action dispatched by the button." - }, - "data": { - "properties": { - "url": { - "type": "string", - "$comment": "This is dynamically generated from the addon.id. See CFRPageActions.sys.mjs", - "description": "URL used in combination with the primary action dispatched." - } - } - } - } - } - } - }, - "secondary": { - "type": "array", - "items": { - "type": "object", - "properties": { - "label": { - "type": "object", - "oneOf": [ - { - "properties": { - "value": { - "allOf": [ - { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText" - }, - { - "description": "Button label override used when a localized version is not available." - } - ] - }, - "attributes": { - "type": "object", - "properties": { - "accesskey": { - "type": "string", - "description": "A single character to be used as a shortcut key for the secondary button. This should be one of the characters that appears in the button label." - } - }, - "required": [ - "accesskey" - ], - "description": "Button attributes." - } - }, - "required": [ - "value", - "attributes" - ] - }, - { - "properties": { - "string_id": { - "allOf": [ - { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/plainText" - }, - { - "description": "Id of localized string for button" - } - ] - } - }, - "required": [ - "string_id" - ] - } - ], - "description": "Id of localized string or message override." - }, - "action": { - "type": "object", - "properties": { - "type": { - "type": "string", - "description": "Action dispatched by the button." - }, - "data": { - "properties": { - "url": { - "allOf": [ - { - "$ref": "file:///ExtensionDoorhanger.schema.json#/$defs/linkUrl" - }, - { - "description": "URL used in combination with the primary action dispatched." - } - ] - } - } - } - } - } - } - } - } - } - } - }, - "additionalProperties": true, - "required": [ - "layout", - "bucket_id", - "heading_text", - "text", - "buttons" - ], - "if": { - "properties": { - "skip_address_bar_notifier": { - "anyOf": [ - { - "const": "false" - }, - { - "const": null - } - ] - } - } - }, - "then": { - "required": [ - "category", - "notification_text" - ] - } - }, - "template": { - "type": "string", - "enum": [ - "cfr_doorhanger", - "milestone_message" - ] - } - }, - "additionalProperties": true, - "required": [ - "targeting", - "trigger" - ], - "$defs": { - "plainText": { - "description": "Plain text (no HTML allowed)", - "type": "string" - }, - "linkUrl": { - "description": "Target for links or buttons", - "type": "string", - "format": "uri" - } - } - }, "InfoBar": { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "file:///InfoBar.schema.json", @@ -1880,9 +1414,6 @@ "enum": [ "action_only", "bookmarks_bar_button", - "cfr_urlbar_chiclet", - "cfr_doorhanger", - "milestone_message", "infobar", "menu_message", "pb_newtab", @@ -2068,45 +1599,6 @@ "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/BookmarksBarButton" } }, - { - "if": { - "type": "object", - "properties": { - "template": { - "type": "string", - "enum": [ - "cfr_urlbar_chiclet" - ] - } - }, - "required": [ - "template" - ] - }, - "then": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/CFRUrlbarChiclet" - } - }, - { - "if": { - "type": "object", - "properties": { - "template": { - "type": "string", - "enum": [ - "cfr_doorhanger", - "milestone_message" - ] - } - }, - "required": [ - "template" - ] - }, - "then": { - "$ref": "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json#/$defs/ExtensionDoorhanger" - } - }, { "if": { "type": "object", diff --git a/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml b/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml index bdf12f00e..1438b8186 100644 --- a/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml +++ b/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml @@ -106,7 +106,7 @@ firefox-v154.0: 558560be69f1baa17ca52cde82ae5d35293eaac5 firefox-v154.1: 0a31de5b12bf9811d1eb5cc555f1c832878f4686 firefox-v155.0: e085522364162451ad4c87a989e0e0a64b0b7d31 firefox-v155.1: 04df3bd66b34441c6b97ee3958535c5bf4633ca4 -main: 7efdbd66b3d190fdf278c62e6eafd467b1741d47 +main: 3261259e0155b9747f26ce5f79b68e9f97a66ba6 release/v117: 43b690c450066d4dde1b2ccb93ed3714d244d502 release/v118: 89a7ea3c3372e5a4ef5b3c5b85499d26198d0524 release/v119: 7dc381f991c6d2a983c3ba7f0cffd880e8c29e7b