For #12026 - Update default top sites for new users (#12028)

fennec/production
Gabriel Luong 4 years ago committed by GitHub
parent f8cb1d6b48
commit e6a56aec36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -50,8 +50,8 @@ class HomeScreenTest {
// Verify Top Sites // Verify Top Sites
verifyExistingTopSitesList() verifyExistingTopSitesList()
verifyExistingTopSitesTabs("Wikipedia") verifyExistingTopSitesTabs("Wikipedia")
verifyExistingTopSitesTabs("YouTube")
verifyExistingTopSitesTabs("Top Articles") verifyExistingTopSitesTabs("Top Articles")
verifyExistingTopSitesTabs("Google")
} }
} }

@ -148,7 +148,7 @@ class TopSitesTest {
val defaultTopSites = arrayOf( val defaultTopSites = arrayOf(
"Top Articles", "Top Articles",
"Wikipedia", "Wikipedia",
"YouTube" "Google"
) )
homeScreen { }.dismissOnboarding() homeScreen { }.dismissOnboarding()

@ -56,6 +56,13 @@ class TopSiteStorage(private val context: Context) {
private fun addDefaultTopSites() { private fun addDefaultTopSites() {
val topSiteCandidates = mutableListOf<Pair<String, String>>() val topSiteCandidates = mutableListOf<Pair<String, String>>()
if (!context.settings().defaultTopSitesAdded) { if (!context.settings().defaultTopSitesAdded) {
topSiteCandidates.add(
Pair(
context.getString(R.string.default_top_site_google),
SupportUtils.GOOGLE_URL
)
)
if (LocaleManager.getSelectedLocale(context).language == "en") { if (LocaleManager.getSelectedLocale(context).language == "en") {
topSiteCandidates.add( topSiteCandidates.add(
Pair( Pair(
@ -72,13 +79,6 @@ class TopSiteStorage(private val context: Context) {
) )
) )
topSiteCandidates.add(
Pair(
context.getString(R.string.default_top_site_youtube),
SupportUtils.YOUTUBE_URL
)
)
GlobalScope.launch(Dispatchers.IO) { GlobalScope.launch(Dispatchers.IO) {
topSiteCandidates.forEach { (title, url) -> topSiteCandidates.forEach { (title, url) ->
addTopSite(title, url, isDefault = true) addTopSite(title, url, isDefault = true)

@ -26,7 +26,7 @@ object SupportUtils {
const val FENIX_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}" const val FENIX_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
const val FIREFOX_BETA_PLAY_STORE_URL = "market://details?id=org.mozilla.firefox_beta" const val FIREFOX_BETA_PLAY_STORE_URL = "market://details?id=org.mozilla.firefox_beta"
const val FIREFOX_NIGHTLY_PLAY_STORE_URL = "market://details?id=org.mozilla.fennec_aurora" const val FIREFOX_NIGHTLY_PLAY_STORE_URL = "market://details?id=org.mozilla.fennec_aurora"
const val YOUTUBE_URL = "https://www.youtube.com/" const val GOOGLE_URL = "https://www.google.com/"
enum class SumoTopic(internal val topicStr: String) { enum class SumoTopic(internal val topicStr: String) {
FENIX_MOVING("sync-delist"), FENIX_MOVING("sync-delist"),

@ -23,8 +23,8 @@
<string name="pocket_pinned_top_articles" translatable="false">Top Articles</string> <string name="pocket_pinned_top_articles" translatable="false">Top Articles</string>
<!-- Default title for pinned Wikipedia top site that links to Wikipedia home page --> <!-- Default title for pinned Wikipedia top site that links to Wikipedia home page -->
<string name="default_top_site_wikipedia" translatable="false">Wikipedia</string> <string name="default_top_site_wikipedia" translatable="false">Wikipedia</string>
<!-- Default title for pinned YouTube top site that links to Youtube home page --> <!-- Default title for pinned Google top site that links to Google home page -->
<string name="default_top_site_youtube" translatable="false">YouTube</string> <string name="default_top_site_google" translatable="false">Google</string>
<!-- Android Components abbreviation used in AboutFragment --> <!-- Android Components abbreviation used in AboutFragment -->
<string name="components_abbreviation" translatable="false">AC</string> <string name="components_abbreviation" translatable="false">AC</string>
<!-- Application Services abbreviation used in AboutFragment --> <!-- Application Services abbreviation used in AboutFragment -->

Loading…
Cancel
Save