From 49feb70b1d6bed261086189b94e71e9e00b5c1ca Mon Sep 17 00:00:00 2001 From: deeppandya Date: Tue, 12 Nov 2024 10:48:02 -0500 Subject: [PATCH 1/3] Remove timer for animation --- .../browser/firstrun/WelcomeOnboardingActivity.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java index 09b2fd1cba8..e33c95b0033 100644 --- a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java +++ b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java @@ -254,12 +254,8 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { return BraveSetDefaultBrowserUtils.isBraveSetAsDefaultBrowser(this); } - private void startTimer(int delayMillis) { - new Handler().postDelayed(this::nextOnboardingStep, delayMillis); - } - ActivityResultLauncher mRequestPermissionLauncher = registerForActivityResult( - new ActivityResultContracts.RequestPermission(), isGranted -> { startTimer(3000); }); + new ActivityResultContracts.RequestPermission(), isGranted -> { nextOnboardingStep(); }); private void nextOnboardingStep() { if (isActivityFinishingOrDestroyed()) return; @@ -328,7 +324,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { && !shouldForceDefaultBrowserPrompt()) { mRequestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS); } else { - startTimer(3000); + nextOnboardingStep(); } } @@ -554,7 +550,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { private void finishNativeInitializationPostWork() { assert mInitializeViewsDone; - startTimer(1000); + nextOnboardingStep(); } @Override From 6c667505c08921c5e4558a5a0a37da04180d5e55 Mon Sep 17 00:00:00 2001 From: deeppandya Date: Tue, 12 Nov 2024 10:50:03 -0500 Subject: [PATCH 2/3] Remove widget page from onboarding Revert "Remove timer for animation" This reverts commit d4cd593d5e54ddda2447f29504140fd9d4c1b18f. --- .../firstrun/WelcomeOnboardingActivity.java | 49 +++---------------- .../android/strings/android_brave_strings.grd | 9 ---- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java index e33c95b0033..21758b9f1b7 100644 --- a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java +++ b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java @@ -54,7 +54,6 @@ import org.chromium.chrome.browser.set_default_browser.BraveSetDefaultBrowserUti import org.chromium.chrome.browser.util.BraveConstants; import org.chromium.chrome.browser.util.BraveTouchUtils; import org.chromium.chrome.browser.util.PackageUtils; -import org.chromium.chrome.browser.widget.quickactionsearchandbookmark.utils.BraveSearchWidgetUtils; import org.chromium.ui.base.DeviceFormFactor; import java.util.Locale; @@ -212,9 +211,6 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { view -> { if (mCurrentStep == 1 && !isDefaultBrowser()) { setDefaultBrowserAndProceedToNextStep(); - } else if (shouldOfferSearchWidget() && mCurrentStep == 2) { - BraveSearchWidgetUtils.requestPinAppWidget(); - nextOnboardingStep(); } else { nextOnboardingStep(); } @@ -237,11 +233,6 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { return !DayZeroHelper.getDayZeroExptFlag() && !isDefaultBrowser(); } - private boolean shouldOfferSearchWidget() { - return !DayZeroHelper.getDayZeroExptFlag() - && BraveSearchWidgetUtils.getShouldShowWidgetPromo(this); - } - private void setDefaultBrowserAndProceedToNextStep() { BraveSetDefaultBrowserUtils.setDefaultBrowser(this); if (!BraveSetDefaultBrowserUtils.supportsDefaultRoleManager()) { @@ -254,8 +245,12 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { return BraveSetDefaultBrowserUtils.isBraveSetAsDefaultBrowser(this); } + private void startTimer(int delayMillis) { + new Handler().postDelayed(this::nextOnboardingStep, delayMillis); + } + ActivityResultLauncher mRequestPermissionLauncher = registerForActivityResult( - new ActivityResultContracts.RequestPermission(), isGranted -> { nextOnboardingStep(); }); + new ActivityResultContracts.RequestPermission(), isGranted -> { startTimer(3000); }); private void nextOnboardingStep() { if (isActivityFinishingOrDestroyed()) return; @@ -269,8 +264,6 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { } else { showBrowserSelectionPage(); } - } else if (shouldOfferSearchWidget() && mCurrentStep == 2) { - showSearchWidgetPage(); } else if (mCurrentStep == getAnalyticsConsentPageStep()) { showAnalyticsConsentPage(); } else { @@ -286,7 +279,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { } private int getAnalyticsConsentPageStep() { - return shouldOfferSearchWidget() ? 3 : 2; + return 2; } private void showIntroPage() { @@ -324,7 +317,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { && !shouldForceDefaultBrowserPrompt()) { mRequestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS); } else { - nextOnboardingStep(); + startTimer(3000); } } @@ -361,32 +354,6 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { } } - private void showSearchWidgetPage() { - int margin = mIsTablet ? 200 : 30; - setLeafAnimation(mVLeafAlignTop, mIvLeafTop, 1.3f, margin, true); - setLeafAnimation(mVLeafAlignBottom, mIvLeafBottom, 1.3f, margin, false); - - if (mTvWelcome != null) { - mTvWelcome.setVisibility(View.GONE); - } - if (mTvCard != null) { - mTvCard.setText(getResources().getString(R.string.onboarding_search_widget_title)); - } - if (mTvDefault != null) { - mTvDefault.setText(getResources().getString(R.string.onboarding_search_widget_text)); - } - if (mBtnPositive != null) { - mBtnPositive.setText( - getResources().getString(R.string.onboarding_search_widget_button)); - } - if (mLayoutCard != null) { - mLayoutCard.setVisibility(View.VISIBLE); - } - if (mIvArrowDown != null) { - mIvArrowDown.setVisibility(View.VISIBLE); - } - } - private void showAnalyticsConsentPage() { int margin = mIsTablet ? 250 : 60; setLeafAnimation(mVLeafAlignTop, mIvLeafTop, 1.5f, margin, true); @@ -550,7 +517,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { private void finishNativeInitializationPostWork() { assert mInitializeViewsDone; - nextOnboardingStep(); + startTimer(1000); } @Override diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index 2f209328b4e..e76fdf6ac5a 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -896,15 +896,6 @@ This file contains all "about" strings. It is set to NOT be translated, in tran With Brave as default, every link you tap opens with Brave's privacy protections. - - Add the search widget - - - Have Brave at your fingertips to explore the web faster. - - - Add to home screen - Block ads. Save data. Every single day. From 3b242e0eb5fb252153f3c50cf02ea2e1f02b8366 Mon Sep 17 00:00:00 2001 From: deeppandya Date: Wed, 13 Nov 2024 12:41:46 -0500 Subject: [PATCH 3/3] Update behaviour for set as default dialog --- .../org/chromium/base/BravePreferenceKeys.java | 1 - .../firstrun/WelcomeOnboardingActivity.java | 9 ++++++--- .../BraveSetDefaultBrowserUtils.java | 14 +------------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/android/java/org/chromium/base/BravePreferenceKeys.java b/android/java/org/chromium/base/BravePreferenceKeys.java index 1febbe10fa9..4c087d2f641 100644 --- a/android/java/org/chromium/base/BravePreferenceKeys.java +++ b/android/java/org/chromium/base/BravePreferenceKeys.java @@ -12,7 +12,6 @@ public final class BravePreferenceKeys { public static final String BRAVE_IS_MENU_FROM_BOTTOM = "brave_is_menu_from_bottom"; public static final String BRAVE_USE_CUSTOM_TABS = "use_custom_tabs"; public static final String BRAVE_APP_OPEN_COUNT = "brave_app_open_count"; - public static final String BRAVE_ROLE_MANAGER_DIALOG_COUNT = "brave_role_manager_dialog_count"; public static final String BRAVE_IS_DEFAULT = "brave_is_default"; public static final String BRAVE_WAS_DEFAULT_ASK_COUNT = "brave_was_default_ask_count"; public static final String BRAVE_SET_DEFAULT_BOTTOM_SHEET_COUNT = diff --git a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java index 21758b9f1b7..70aa9d572b5 100644 --- a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java +++ b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java @@ -259,10 +259,13 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { if (mCurrentStep == 0) { showIntroPage(); } else if (mCurrentStep == 1) { - if (shouldForceDefaultBrowserPrompt()) { + if (DayZeroHelper.getDayZeroExptFlag() + || !BraveSetDefaultBrowserUtils.supportsDefaultRoleManager()) { + showBrowserSelectionPage(); + } else if (!isDefaultBrowser()) { setDefaultBrowserAndProceedToNextStep(); } else { - showBrowserSelectionPage(); + nextOnboardingStep(); } } else if (mCurrentStep == getAnalyticsConsentPageStep()) { showAnalyticsConsentPage(); @@ -314,7 +317,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase { 200); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU - && !shouldForceDefaultBrowserPrompt()) { + && DayZeroHelper.getDayZeroExptFlag()) { mRequestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS); } else { startTimer(3000); diff --git a/android/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java b/android/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java index 0c6a53f13a3..9e7916ec068 100644 --- a/android/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java +++ b/android/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java @@ -145,22 +145,11 @@ public class BraveSetDefaultBrowserUtils { } public static void setDefaultBrowser(Activity activity) { - int roleManagerOpenCount = - ChromeSharedPreferences.getInstance() - .readInt(BravePreferenceKeys.BRAVE_ROLE_MANAGER_DIALOG_COUNT); - - if (supportsDefaultRoleManager() && roleManagerOpenCount < 2) { + if (supportsDefaultRoleManager()) { RoleManager roleManager = activity.getSystemService(RoleManager.class); if (roleManager.isRoleAvailable(RoleManager.ROLE_BROWSER)) { if (!roleManager.isRoleHeld(RoleManager.ROLE_BROWSER)) { - // save role manager open count as the second times onwards the dialog is shown, - // the system allows the user to click on "don't show again". - ChromeSharedPreferences.getInstance() - .writeInt( - BravePreferenceKeys.BRAVE_ROLE_MANAGER_DIALOG_COUNT, - roleManagerOpenCount + 1); - activity.startActivityForResult( roleManager.createRequestRoleIntent(RoleManager.ROLE_BROWSER), BraveConstants.DEFAULT_BROWSER_ROLE_REQUEST_CODE); @@ -171,7 +160,6 @@ public class BraveSetDefaultBrowserUtils { } else if (supportsDefault()) { openDefaultAppsSettings(activity); - } else { ResolveInfo resolveInfo = getResolveInfo(activity); if (resolveInfo.activityInfo.packageName.equals(ANDROID_SETUPWIZARD_PACKAGE_NAME)