Merge pull request #26999 from brave/new_onboarding_changes_android

New onboarding changes android Resolve rebase issue
brave · Dec 18, 2024 · 302fc27 · 302fc27
1 parent 16b06b7
commit 302fc27
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/android/java/org/chromium/base/BraveFeatureList.java b/android/java/org/chromium/base/BraveFeatureList.java
@@ -33,5 +33,6 @@ public abstract class BraveFeatureList {
     public static final String BRAVE_SHOW_STRICT_FINGERPRINTING_MODE =
             "BraveShowStrictFingerprintingMode";
     public static final String BRAVE_DAY_ZERO_EXPERIMENT = "BraveDayZeroExperiment";
+    public static final String BRAVE_NEW_ANDROID_ONBOARDING = "NewAndroidOnboarding";
     public static final String BRAVE_FALLBACK_DOH_PROVIDER = "BraveFallbackDoHProvider";
 }
diff --git a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java
@@ -35,14 +35,15 @@
 import com.android.installreferrer.api.InstallReferrerStateListener;
 import com.android.installreferrer.api.ReferrerDetails;
 
+import org.chromium.base.BraveFeatureList;
 import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveLocalState;
 import org.chromium.chrome.browser.back_press.SecondaryActivityBackPressUma.SecondaryActivity;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
-import org.chromium.chrome.browser.day_zero.DayZeroHelper;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.metrics.ChangeMetricsReportingStateCalledFrom;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
@@ -230,7 +231,11 @@ private void onClickViews() {
     }
 
     private boolean shouldForceDefaultBrowserPrompt() {
-        return !DayZeroHelper.getDayZeroExptFlag() && !isDefaultBrowser();
+        return isNewOnboardingEnabled() && !isDefaultBrowser();
+    }
+
+    private boolean isNewOnboardingEnabled() {
+        return ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_NEW_ANDROID_ONBOARDING);
     }
 
     private void setDefaultBrowserAndProceedToNextStep() {
@@ -259,7 +264,7 @@ private void nextOnboardingStep() {
         if (mCurrentStep == 0) {
             showIntroPage();
         } else if (mCurrentStep == 1) {
-            if (DayZeroHelper.getDayZeroExptFlag()
+            if (!isNewOnboardingEnabled()
                     || !BraveSetDefaultBrowserUtils.supportsDefaultRoleManager()) {
                 showBrowserSelectionPage();
             } else if (!isDefaultBrowser()) {
@@ -316,8 +321,7 @@ public void run() {
                         },
                         200);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-                && DayZeroHelper.getDayZeroExptFlag()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && !isNewOnboardingEnabled()) {
             mRequestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
         } else {
             startTimer(3000);

diff --git a/browser/brave_browser_features.cc b/browser/brave_browser_features.cc
@@ -46,6 +46,13 @@ BASE_FEATURE(kBraveDayZeroExperiment,
              "BraveDayZeroExperiment",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
+#if BUILDFLAG(IS_ANDROID)
+// Enable new onboarding on Android
+BASE_FEATURE(kNewAndroidOnboarding,
+             "NewAndroidOnboarding",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+#endif  // BUILDFLAG(IS_ANDROID)
+
 // The variant of the "day zero" experiment. i.e. A, B, C, D, etc.
 const base::FeatureParam<std::string> kBraveDayZeroExperimentVariant{
     &kBraveDayZeroExperiment,

diff --git a/browser/brave_browser_features.h b/browser/brave_browser_features.h
@@ -19,6 +19,9 @@ BASE_DECLARE_FEATURE(kBraveCopyCleanLinkFromJs);
 BASE_DECLARE_FEATURE(kBraveOverrideDownloadDangerLevel);
 BASE_DECLARE_FEATURE(kBraveWebViewRoundedCorners);
 BASE_DECLARE_FEATURE(kBraveDayZeroExperiment);
+#if BUILDFLAG(IS_ANDROID)
+BASE_DECLARE_FEATURE(kNewAndroidOnboarding);
+#endif  // BUILDFLAG(IS_ANDROID)
 
 extern const base::FeatureParam<std::string> kBraveDayZeroExperimentVariant;
 

diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc
@@ -6,6 +6,7 @@
 #include "base/feature_override.h"
 #include "brave/browser/android/background_video/features.h"
 #include "brave/browser/android/safe_browsing/features.h"
+#include "brave/browser/brave_browser_features.h"
 #include "brave/components/ai_chat/core/common/features.h"
 #include "brave/components/brave_news/common/features.h"
 #include "brave/components/brave_rewards/common/features.h"
@@ -44,7 +45,8 @@
     &google_sign_in_permission::features::kBraveGoogleSignInPermission, \
     &net::features::kBraveForgetFirstPartyStorage,                      \
     &brave_shields::features::kBraveShowStrictFingerprintingMode,       \
-    &brave_shields::features::kBraveLocalhostAccessPermission
+    &brave_shields::features::kBraveLocalhostAccessPermission,          \
+    &features::kNewAndroidOnboarding
 
 // clang-format on