diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt index 4042742445..5c724ede88 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt @@ -50,7 +50,7 @@ class SettingsSubMenuHomepageRobot { } private fun mostVisitedTopSitesButton() = - onView(allOf(withText(R.string.top_sites_toggle_top_recent_sites_3))) + onView(allOf(withText(R.string.top_sites_toggle_top_recent_sites_4))) private fun jumpBackInButton() = onView(allOf(withText(R.string.customize_toggle_jump_back_in))) diff --git a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt index 12e80364fe..8e1dcd8480 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt @@ -5,6 +5,7 @@ package org.mozilla.fenix.settings import android.os.Bundle +import androidx.preference.CheckBoxPreference import androidx.navigation.findNavController import androidx.preference.Preference import androidx.preference.PreferenceCategory @@ -39,6 +40,12 @@ class HomeSettingsFragment : PreferenceFragmentCompat() { onPreferenceChangeListener = CustomizeHomeMetricsUpdater() } + requirePreference(R.string.pref_key_enable_contile).apply { + isVisible = FeatureFlags.contileFeature + isChecked = context.settings().showContileFeature + onPreferenceChangeListener = CustomizeHomeMetricsUpdater() + } + requirePreference(R.string.pref_key_recent_tabs).apply { isVisible = FeatureFlags.showRecentTabsFeature isChecked = context.settings().showRecentTabsFeature diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index e828cabc9a..6077b6b417 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -1248,4 +1248,13 @@ class Settings(private val appContext: Context) : PreferencesHolder { featureFlag = FeatureFlags.isPocketRecommendationsFeatureEnabled(appContext), default = { appContext.components.analytics.features.homeScreen.isPocketRecommendationsActive() }, ) + + /** + * Indicates if the Contile functionality should be visible. + */ + var showContileFeature by featureFlagPreference( + key = appContext.getPreferenceKey(R.string.pref_key_enable_contile), + default = false, + featureFlag = FeatureFlags.contileFeature, + ) } diff --git a/app/src/main/res/layout/checkbox_left_sub_preference.xml b/app/src/main/res/layout/checkbox_left_sub_preference.xml index 2913a9811a..f1792f6a7d 100644 --- a/app/src/main/res/layout/checkbox_left_sub_preference.xml +++ b/app/src/main/res/layout/checkbox_left_sub_preference.xml @@ -12,7 +12,7 @@ android:clickable="true" android:focusable="true" android:gravity="center_vertical" - android:layout_marginStart="@dimen/custom_checkbox_alignment_margin"> + android:paddingStart="@dimen/custom_checkbox_alignment_margin"> pref_key_top_sites_max_limit pref_key_top_frecent_sites + + pref_key_contile pref_key_user_knows_about_pwa diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 33a543f373..3a68d541a8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -454,6 +454,8 @@ Pocket Wallpapers + + Sponsored shortcuts @@ -1883,8 +1885,10 @@ To add a new top site, remove one. Touch and hold the site and select remove. OK, Got It - - Most visited top sites + + Most visited top sites + + Shortcuts Name diff --git a/app/src/main/res/xml/home_preferences.xml b/app/src/main/res/xml/home_preferences.xml index 136a065d4e..91caacc48a 100644 --- a/app/src/main/res/xml/home_preferences.xml +++ b/app/src/main/res/xml/home_preferences.xml @@ -7,7 +7,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + android:title="@string/top_sites_toggle_top_recent_sites_4" /> + +