diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index b420fd9795..d621137f94 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -85,9 +85,4 @@ object FeatureFlags {
return Config.channel.isNightlyOrDebug &&
"en-US" == LocaleManager.getCurrentLocale(context)?.toLanguageTag() ?: getSystemDefault().toLanguageTag()
}
-
- /**
- * Enables showing the homescreen onboarding card.
- */
- val showHomeOnboarding = Config.channel.isDebug
}
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
index 9b956a3ddc..078110cc4e 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
@@ -27,7 +27,6 @@ import mozilla.components.feature.top.sites.TopSite
import mozilla.components.support.ktx.android.view.showKeyboard
import mozilla.components.support.ktx.kotlin.isUrl
import org.mozilla.fenix.BrowserDirection
-import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.browser.BrowserFragmentDirections
@@ -455,12 +454,10 @@ class DefaultSessionControlController(
}
override fun handleShowOnboardingDialog() {
- if (FeatureFlags.showHomeOnboarding) {
- navController.nav(
- R.id.homeFragment,
- HomeFragmentDirections.actionGlobalHomeOnboardingDialog()
- )
- }
+ navController.nav(
+ R.id.homeFragment,
+ HomeFragmentDirections.actionGlobalHomeOnboardingDialog()
+ )
}
override fun handleReadPrivacyNoticeClicked() {
diff --git a/app/src/main/res/layout/fragment_onboarding_home_dialog.xml b/app/src/main/res/layout/fragment_onboarding_home_dialog.xml
index b5356211b7..f648279450 100644
--- a/app/src/main/res/layout/fragment_onboarding_home_dialog.xml
+++ b/app/src/main/res/layout/fragment_onboarding_home_dialog.xml
@@ -37,7 +37,7 @@
android:layout_marginTop="16dp"
android:layout_marginHorizontal="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="24sp"
- android:text="@string/onboarding_home_screen_title"
+ android:text="@string/onboarding_home_screen_title_2"
android:textAppearance="@style/Header20TextStyle"
android:textAlignment="center"
app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
android:layout_marginHorizontal="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="24sp"
android:textAppearance="@style/Body14TextStyle"
- android:text="@string/onboarding_home_screen_description"
+ android:text="@string/onboarding_home_screen_description_2"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/welcome_title" />
@@ -78,7 +78,7 @@
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:layout_marginTop="26dp"
android:lineHeight="20sp"
- android:text="@string/onboarding_home_screen_section_home_title"
+ android:text="@string/onboarding_home_screen_section_home_title_2"
android:textAppearance="@style/Header14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/home_icon"
@@ -101,7 +101,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="20sp"
- android:text="@string/onboarding_home_screen_section_home_description"
+ android:text="@string/onboarding_home_screen_section_home_description_2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/home_placeholder"
@@ -127,7 +127,7 @@
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:layout_marginTop="26dp"
android:lineHeight="20sp"
- android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_title"
+ android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_title_2"
android:textAppearance="@style/Header14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/cleaner_tab_tray_icon"
@@ -150,7 +150,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="20sp"
- android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_description"
+ android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_description_2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/cleaner_tab_tray_placeholder"
@@ -176,7 +176,7 @@
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:layout_marginTop="26dp"
android:lineHeight="20sp"
- android:text="@string/onboarding_home_screen_section_useful_history_title"
+ android:text="@string/onboarding_home_screen_section_useful_history_title_2"
android:textAppearance="@style/Header14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/useful_history_icon"
@@ -199,7 +199,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
android:lineHeight="20sp"
- android:text="@string/onboarding_home_screen_section_useful_history_description"
+ android:text="@string/onboarding_home_screen_section_useful_history_description_2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/useful_history_placeholder"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d3dd21465..dbcfd1757d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -258,21 +258,21 @@
- What’s new in Firefox!
+ What’s new in Firefox
- It’s now easier to pick up where you left off so you can stay in the flow.
+ It’s now easier to pick back up where you left off.
- Personalized Firefox home
+ Personalized Firefox homepage
- Access your open tabs, bookmarks, and history directly from your home screen.
+ Jump to your open tabs, bookmarks, and browsing history.
- Cleaner tab tray
-
- Firefox helps you to manage your tabs and quickly find what you’re looking for.
+ Clean, organized tabs
+
+ Clear away tab clutter with improved layout and auto-closing tabs.
- Useful history
+ Recent searches
- Get a better overview of your browsing history.
+ Revisit your latest searches from your homepage and tabs.