From 62118be809aa07ad341fb362479bc46010e4bf5b Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Tue, 5 Oct 2021 17:18:11 -0400
Subject: [PATCH] For #21574: disabled the homescreen onboarding dialog.

(cherry picked from commit 7e3a2ba89d2ecfb3b4c9c35153d8b81554339ba1)
---
 app/src/debug/res/raw/initial_experiments.json        |  2 +-
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt   |  5 +++++
 .../home/sessioncontrol/SessionControlController.kt   | 11 +++++++----
 .../fenix/home/DefaultSessionControlControllerTest.kt |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/debug/res/raw/initial_experiments.json b/app/src/debug/res/raw/initial_experiments.json
index 6bced9269e..3514af8ee0 100644
--- a/app/src/debug/res/raw/initial_experiments.json
+++ b/app/src/debug/res/raw/initial_experiments.json
@@ -12,7 +12,7 @@
                       "value": {
                            "sections-enabled": {
                                "topSites": true,
-                               "recentExplorations": true,
+                               "recentExplorations": false,
                                "recentlySaved": false,
                                "jumpBackIn": false,
                                "pocket": false
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 4fc1cb0046..165beb7822 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -85,4 +85,9 @@ object FeatureFlags {
         return "en-US" == LocaleManager.getCurrentLocale(context)
             ?.toLanguageTag() ?: getSystemDefault().toLanguageTag()
     }
+
+    /**
+     * Enables showing the homescreen onboarding card.
+     */
+    const val showHomeOnboarding = false
 }
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 078110cc4e..9b956a3ddc 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,6 +27,7 @@ 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
@@ -454,10 +455,12 @@ class DefaultSessionControlController(
     }
 
     override fun handleShowOnboardingDialog() {
-        navController.nav(
-            R.id.homeFragment,
-            HomeFragmentDirections.actionGlobalHomeOnboardingDialog()
-        )
+        if (FeatureFlags.showHomeOnboarding) {
+            navController.nav(
+                R.id.homeFragment,
+                HomeFragmentDirections.actionGlobalHomeOnboardingDialog()
+            )
+        }
     }
 
     override fun handleReadPrivacyNoticeClicked() {
diff --git a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
index 0b429eecab..e82204ccc8 100644
--- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
@@ -178,6 +178,7 @@ class DefaultSessionControlControllerTest {
     }
 
     @Test
+    @Ignore("Until the feature is enabled again")
     fun handleShowOnboardingDialog() {
         createController().handleShowOnboardingDialog()