From 09813e1323222fc71b9f8330e49c40bf02bf7e35 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Wed, 24 Jan 2024 13:49:23 +0100 Subject: [PATCH] Enabling the choice of search engine in fre #594 Edited urls pending creation of wiki pages --- build/patches/Welcome-screen.patch | 44 +++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index a020b552..b0a9f956 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -12,14 +12,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/android/java/res/values/dimens.xml | 10 + chrome/android/java/res/values/styles.xml | 24 ++ .../firstrun/ChildAccountStatusSupplier.java | 13 - + .../DefaultSearchEngineFirstRunFragment.java | 3 - .../browser/firstrun/FirstRunActivity.java | 17 +- .../firstrun/FirstRunActivityBase.java | 6 +- .../firstrun/FirstRunFlowSequencer.java | 63 +--- .../browser/firstrun/FirstRunUtils.java | 15 +- .../firstrun/ToSAndUMAFirstRunFragment.java | 336 ++++++++++++++++++ .../firstrun/TosAndUmaFragmentView.java | 336 ++++++++++++++++++ + .../browser/locale/LocaleManagerDelegate.java | 5 +- .../strings/android_chrome_strings.grd | 24 +- - 13 files changed, 911 insertions(+), 96 deletions(-) + 15 files changed, 914 insertions(+), 101 deletions(-) create mode 100644 chrome/android/java/res/layout/fre_tosanduma.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFragmentView.java @@ -296,6 +298,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildA } @Override +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java +@@ -51,15 +51,12 @@ public class DefaultSearchEngineFirstRunFragment extends Fragment implements Fir + Profile profile = getPageDelegate().getProfileProviderSupplier().get().getOriginalProfile(); + + assert TemplateUrlServiceFactory.getForProfile(profile).isLoaded(); +- mSearchEnginePromoDialogType = LocaleManager.getInstance().getSearchEnginePromoShowType(); +- if (mSearchEnginePromoDialogType != SearchEnginePromoType.DONT_SHOW) { + new DefaultSearchEngineDialogHelper( + mSearchEnginePromoDialogType, + LocaleManager.getInstance(), + mEngineLayout, + mButton, + getPageDelegate()::advanceToNextPage); +- } + + return rootView; + } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java @@ -427,7 +448,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR - int searchPromoType = LocaleManager.getInstance().getSearchEnginePromoShowType(); - return searchPromoType == SearchEnginePromoType.SHOW_NEW - || searchPromoType == SearchEnginePromoType.SHOW_EXISTING; -+ return false; ++ return true; } /** @return true if Sync is allowed for the current user. */ @@ -1234,6 +1255,21 @@ new file mode 100644 + return mLastWidth > mLastHeight; + } +} +diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java +--- a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java ++++ b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java +@@ -331,8 +331,9 @@ public class LocaleManagerDelegate { + + /** @see LocaleManager#getSearchEnginesForPromoDialog */ + public List getSearchEnginesForPromoDialog(@SearchEnginePromoType int promoType) { +- throw new IllegalStateException( +- "Not applicable unless existing or new promos are required"); ++ TemplateUrlService templateUrlService = ++ TemplateUrlServiceFactory.getForProfile(Profile.getLastUsedRegularProfile()); ++ return templateUrlService.getTemplateUrls(); + } + + /** @see LocaleManager#onUserSearchEngineChoice */ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -1261,10 +1297,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + https://docs.github.com/en/github/site-policy/github-privacy-statement#github-pages + + -+ https://github.com/bromite/bromite/wiki/AdBlocking ++ https://github.com/uazo/cromite/wiki/AdBlocking + + -+ https://github.com/bromite/bromite/wiki/AutomaticUpdates ++ https://github.com/uazo/cromite/wiki/AutomaticUpdates Welcome to Chrome