Update default search for 5 regions #10326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bsclifton
force-pushed
the
bsc-update-default-search
branch
3 times, most recently
from
2184f56 to
6c29134
Compare
bsclifton
force-pushed
the
bsc-update-default-search
branch
from
6c29134 to
2058682
Compare
bsclifton
commented
Oct 4, 2021
| @@ -132,6 +133,8 @@ | |||
| BraveRewardsObserver, BraveRewardsNativeWorker.PublisherObserver { | |||
| public static final String PREF_HIDE_BRAVE_REWARDS_ICON = "hide_brave_rewards_icon"; | |||
| private static final String JAPAN_COUNTRY_CODE = "JP"; | |||
| private static final List<String> mBraveSearchEngineDefaultRegions = | |||
| Arrays.asList("CA", "DE", "FR", "GB", "US"); | |||
There was a problem hiding this comment.
Besides these, I think we also need remove the US/CA restriction we added in 4808157 (to android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java)
That way we can show Brave Search for all other regions (which don't have Brave Search as default)
goodov
approved these changes
Oct 4, 2021
alexsafe
approved these changes
Oct 5, 2021
emerick
approved these changes
Oct 5, 2021
| @@ -41,6 +41,7 @@ declare namespace Welcome { | |||
|
|
|||
| export interface State { | |||
| searchProviders: Array<SearchEngineEntry> | |||
| browserProfiles: Array<BrowserProfile> | |||
| browserProfiles: Array<BrowserProfile>, | |||
There was a problem hiding this comment.
Nit: I don't think you need a comma here...
7 tasks
bsclifton
pushed a commit
that referenced
this pull request
Oct 6, 2021
24 tasks
bsclifton
added a commit
that referenced
this pull request
Oct 7, 2021
…wnHost` Fixes brave/brave-browser#18606 Unintentionally caused by #10326 - CI showed a clean run? this should have failed :/ - DefaultAPIVisibleKnownHost was failing on can it set brave.com as default. It can't, because after 10326 it's ALREADY default
Case brave/brave-browser#18331 (Update SE defaults) - DesktopVerification PASSED on Found brave/brave-browser#18683 & brave/brave-browser#18720 while running through brave/brave-browser#18331. Upgrades for
|
Default Upgrade |
Custom Upgrade |
|---|---|
 |
 |
USA
Clean Install:
- ensured that the search section under
brave://welcomewas removed (Cases/Screenshots below) - ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
brave://settings/search
Upgrade Case (Default/Custom SE):
- installed
1.32.45 Chromium: 94.0.4606.71and ensured that the default SE is set asGoogle - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatGooglewas still the default SE after upgrading - installed
1.32.45 Chromium: 94.0.4606.71and selectedStartpageas the default SE frombrave://settings/search - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatStartpagewas still the default SE after upgrading
Default Upgrade |
Custom Upgrade |
|---|---|
 |
 |
GB
Clean Install:
- ensured that the search section under
brave://welcomewas removed (Cases/Screenshots below) - ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
brave://settings/search
Upgrade Case (Default/Custom SE):
- installed
1.32.45 Chromium: 94.0.4606.71and ensured that the default SE is set asGoogle - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatGooglewas still the default SE after upgrading - installed
1.32.45 Chromium: 94.0.4606.71and selectedEcosiaas the default SE frombrave://settings/search - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatEcosiawas still the default SE after upgrading
Default Upgrade |
Custom Upgrade |
|---|---|
 |
 |
France
Clean Install:
- ensured that the search section under
brave://welcomewas removed (Cases/Screenshots below) - ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
brave://settings/search
Upgrade Case (Default/Custom SE):
- installed
1.32.45 Chromium: 94.0.4606.71and ensured that the default SE is set asQwant - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatQwantwas still the default SE after upgrading - installed
1.32.45 Chromium: 94.0.4606.71and selectedEcosiaas the default SE frombrave://settings/search - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatEcosiawas still the default SE after upgrading
Default Upgrade |
Custom Upgrade |
|---|---|
 |
 |
Germany
Clean Install:
- ensured that the search section under
brave://welcomewas removed (Cases/Screenshots below) - ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
brave://settings/search
Upgrade Case (Default/Custom SE)
- installed
1.32.45 Chromium: 94.0.4606.71and ensured that the default SE is set asGoogle - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatGooglewas still the default SE after upgrading - installed
1.32.45 Chromium: 94.0.4606.71and selectedBraveas the default SE frombrave://settings/search - upgraded to
1.32.63 Chromium: 95.0.4638.40and ensured thatBravewas still the default SE after upgrading
Default Upgrade |
Custom Upgrade |
|---|---|
 |
 |
Case brave/brave-browser#18331 (Update SE defaults) - Android
Verification PASSED on Samsung S10+ running Android 11
using the following build:
Brave | 1.32.63 Chromium: 95.0.4638.40 (Official Build) nightly (64-bit)
-- | --
Revision | e3e7c76ba0284b16087cf4cf3153abfaef6470c7-refs/branch-heads/4638@{#624}
OS | Windows 11 Version 21H2 (Build 22000.194)
Upgrades for CA / DE / FR / GB / US
Canada
Clean Install:
- ensured that the search on-boarding modal was removed when tapping on the URL bar (Cases/Screenshots below)
- ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
Settings->Search enginefor bothStandard&Privatetabs/windows
Standard |
Private |
|---|---|
 |
 |
Upgrade Case (Default/Custom SE):
- installed
1.32.44 Chromium: 94.0.4606.71and ensured that the default SE is set asGoogle - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatGooglewas still the default SE after upgrading - installed
1.32.44 Chromium: 94.0.4606.71and selectedBingas the default SE for bothStandard&Private - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatBingwas still the default SE after upgrading
USA
Clean Install:
- ensured that the search on-boarding modal was removed when tapping on the URL bar (Cases/Screenshots below)
- ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
Settings->Search enginefor bothStandard&Privatetabs/windows
Standard |
Private |
|---|---|
 |
 |
Upgrade Case (Default/Custom SE):
- installed
1.32.44 Chromium: 94.0.4606.71and ensured that the default SE is set asGoogle - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatGooglewas still the default SE after upgrading - installed
1.32.44 Chromium: 94.0.4606.71and selectedBraveas the default SE forStandard&StartpageforPrivate - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatBrave&Startpagewere still the default SE
GB
Clean Install:
- ensured that the search on-boarding modal was removed when tapping on the URL bar (Cases/Screenshots below)
- ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
Settings->Search enginefor bothStandard&Privatetabs/windows
Standard |
Private |
|---|---|
 |
 |
Upgrade Case (Default/Custom SE):
- installed
1.32.44 Chromium: 94.0.4606.71and ensured that the default SE is set asGoogle - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatGooglewas still the default SE after upgrading - installed
1.32.44 Chromium: 94.0.4606.71and selectedQwantas the default SE forStandard&EcosiaforPrivate - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatQwant&Ecosiawere still the default SE
France
Clean Install:
- ensured that the search on-boarding modal was removed when tapping on the URL bar (Cases/Screenshots below)
- ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
Settings->Search enginefor bothStandard&Privatetabs/windows
Standard |
Private |
|---|---|
 |
 |
Upgrade Case (Default/Custom SE):
- installed
1.32.44 Chromium: 94.0.4606.71and ensured that the default SE is set asQwant - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatQwantwas still the default SE after upgrading - installed
1.32.44 Chromium: 94.0.4606.71and selectedDDGas the default SE forStandard&BingforPrivate - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatDDG&Bingwere still the default SE
Germany
Clean Install:
- ensured that the search on-boarding modal was removed when tapping on the URL bar (Cases/Screenshots below)
- ensured that Brave is the default SE on a clean profile
- ensured that Brave appears as the default SE under
Settings->Search enginefor bothStandard&Privatetabs/windows
Standard |
Private |
|---|---|
 |
 |
Upgrade Case (Default/Custom SE):
- installed
1.32.44 Chromium: 94.0.4606.71and ensured that the default SE is set asGoogle - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatGooglewas still the default SE after upgrading - installed
1.32.44 Chromium: 94.0.4606.71and selectedBingas the default SE forBrave&EcosiaforPrivate - upgraded to
1.32.66 Chromium: 95.0.4638.40and ensured thatBing&Bravewere still the default SE
Regions other than CA / DE / FR / GB / US
- ensured that the on-boarding modal is displayed when a user taps on the URL bar
- ensured that
Bravesearch doesn't appear under the on-boarding modal - ensured that
Bravesearch appears at the top under bothNormal&Privatewindows viaSettings->Search engines
Spain
On-boarding |
Normal Window |
Private Window |
|---|---|---|
 |
 |
 |
Poland
On-boarding |
Normal Window |
Private Window |
|---|---|---|
 |
 |
 |
Russia
On-boarding |
Normal Window |
Private Window |
|---|---|---|
 |
 |
 |
Kazakhstan
On-boarding |
Normal Window |
Private Window |
|---|---|---|
 |
 |
 |
Case brave/brave-browser#18415 (Removed from brave://welcome)
Verification PASSED on Win 11 x64 using the following build:
Brave | 1.32.61 Chromium: 95.0.4638.40 (Official Build) nightly (64-bit)
-- | --
Revision | e3e7c76ba0284b16087cf4cf3153abfaef6470c7-refs/branch-heads/4638@{#624}
OS | Windows 11 Version 21H2 (Build 22000.194)
- ensured that
CA,USA,GB,DE&FRare not displaying the search engine selection screen underbrave://welcome
Search section being removed from brave://welcome
CA |
USA |
GB |
DE |
FR |
|---|---|---|---|---|
 |
 |
 |
 |
 |
Search section shouldn't be removed from brave://welcome
- ensured that locales such as
Poland&Spainstill have the search engine selection section underbrave://welcome
Poland |
Spain |
|---|---|
 |
 |
Case brave/brave-browser#18452 (Removed on-boarding when tapping on URL)
Verification PASSED on Samsung S10+ running Android 11 using the following build:
1.32.61 Chromium: 95.0.4638.40
- ensured that the search on-boarding was removed from
CA,USA,GB,DE&FRwhen tapping on the URL bar - ensured that the search on-boarding was was being displayed for both
Poland&Spainlocales
Example of locales that still have on-boarding enabled when tapping on the URL bar:
Poland |
Spain |
|---|---|
 |
 |
bsclifton
added a commit
that referenced
this pull request
Oct 11, 2021
This was missed in #10326 Fixes brave/brave-browser#18683
24 tasks
bsclifton
pushed a commit
that referenced
this pull request
Oct 12, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes brave/brave-browser#18331
Fixes brave/brave-browser#18415
Fixes brave/brave-browser#18452
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_tests,npm run lint,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan: