diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index cd44dad6b..2c92932a9 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -113,6 +113,5 @@ object FeatureFlags {
/**
* Enables receiving from the messaging framework.
*/
- @Suppress("MayBeConst")
- val messagingFeature = false
+ val messagingFeature = Config.channel.isNightlyOrDebug
}
diff --git a/app/src/main/java/org/mozilla/fenix/gleanplumb/CustomAttributeProvider.kt b/app/src/main/java/org/mozilla/fenix/gleanplumb/CustomAttributeProvider.kt
index d18f2e855..409559d63 100644
--- a/app/src/main/java/org/mozilla/fenix/gleanplumb/CustomAttributeProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/gleanplumb/CustomAttributeProvider.kt
@@ -26,7 +26,7 @@ object CustomAttributeProvider {
val now = Calendar.getInstance()
return JSONObject(
mapOf(
- "is_default_browser" to BrowsersCache.all(context).isDefaultBrowser,
+ "is_default_browser_string" to BrowsersCache.all(context).isDefaultBrowser.toString(),
"date_string" to formatter.format(now.time)
)
)
diff --git a/app/src/main/res/layout/nimbus_message_card.xml b/app/src/main/res/layout/nimbus_message_card.xml
index ea312f331..964088bb3 100644
--- a/app/src/main/res/layout/nimbus_message_card.xml
+++ b/app/src/main/res/layout/nimbus_message_card.xml
@@ -14,13 +14,13 @@
android:id="@+id/title_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
tools:text="Title"
+ android:layout_marginBottom="10dp"
android:textAppearance="@style/Header16TextStyle"
- app:layout_constraintBottom_toTopOf="@id/description_text"
- app:layout_constraintEnd_toStartOf="@id/close"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintEnd_toStartOf="@id/close"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/description_text" />
+ app:layout_constraintTop_toTopOf="@id/title_text" />
diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml
index 433d65b71..eac6abd60 100644
--- a/nimbus.fml.yaml
+++ b/nimbus.fml.yaml
@@ -115,35 +115,37 @@ features:
defaults:
- value:
triggers:
- 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_DE_SPEAKER: "'de' in locale"
- USER_FR_SPEAKER: "'fr' in locale"
- DEVICE_ANDROID: os == 'Android'
- DEVICE_IOS: os == 'iOS'
- ALWAYS: "true"
- NEVER: "false"
+ 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_DE_SPEAKER: "'de' in locale"
+ USER_FR_SPEAKER: "'fr' in locale"
+ DEVICE_ANDROID: os == 'Android'
+ DEVICE_IOS: os == 'iOS'
+ ALWAYS: "true"
+ NEVER: "false"
+ I_AM_DEFAULT_BROWSER: "is_default_browser_string == 'true'"
+ I_AM_NOT_DEFAULT_BROWSER: "is_default_browser_string == 'false'"
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
+ 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
+ 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
@@ -167,61 +169,15 @@ features:
EXPIRES_QUICKLY:
priority: 100
max-display-count: 1
- - channel: developer
- value: {
- "messages": {
- "my-viewpoint-survey": {
- "title": "Message tile",
- "text": "Love Firefox? Fill in our survey!",
- "action": "https://surveyprovider.com/survey-id/{uuid}",
- "trigger": [ "ALWAYS" ],
- "style": "DEFAULT",
- "button-label": "Go to the survey"
- }
- }
- }
- - channel: developer
- value: {
- "messages": {
- "private-tabs-auto-close": {
- "action": "OPEN_SETTINGS",
- "text": "Sharing your phone? Autoclosing private tabs is for you!",
- "trigger": [
- "USER_RECENTLY_INSTALLED"
- ]
- }
- },
-
- "message-under-experiment": "private-tabs-auto-close"
- }
- - channel: developer
- value: {
- "triggers": {
- "USER_IE_COUNTRY": "'IE' in locale"
- },
-
- "styles": {
- "irish-green": {
- "priority": 50
- }
- },
-
- "messages": {
- "eu-tracking-protection-for-ireland": {
- "action": "OPEN_SETTINGS",
- "text": "GDPR has you covered. Firefox has GDPR covered",
- "style": "irish-green",
- "trigger": [
- "NEW_USER",
- "USER_IE_COUNTRY"
- ]
- }
- },
-
- "message-under-experiment": "eu-tracking-protection-for-"
- }
-
-
+ - channel: nightly
+ value:
+ messages:
+ default-browser:
+ text: default_browser_experiment_card_text
+ action: "MAKE_DEFAULT_BROWSER"
+ trigger: [ "I_AM_NOT_DEFAULT_BROWSER" ]
+ style: "DEFAULT"
+ button-label: preferences_set_as_default_browser
types:
objects: