* Add notifications pref in top level settings to route to Android app and notification settings * Make pref visible on Oreo and higher * Only show notifications pref when Oreo and abovemaster
parent
f83372b67c
commit
2e62dd5c87
|
@ -270,6 +270,13 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
||||||
resources.getString(R.string.pref_key_delete_browsing_data_on_quit_preference) -> {
|
resources.getString(R.string.pref_key_delete_browsing_data_on_quit_preference) -> {
|
||||||
SettingsFragmentDirections.actionSettingsFragmentToDeleteBrowsingDataOnQuitFragment()
|
SettingsFragmentDirections.actionSettingsFragmentToDeleteBrowsingDataOnQuitFragment()
|
||||||
}
|
}
|
||||||
|
resources.getString(R.string.pref_key_notifications) -> {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
|
||||||
|
startActivity(intent)
|
||||||
|
}
|
||||||
|
null
|
||||||
|
}
|
||||||
resources.getString(R.string.pref_key_customize) -> {
|
resources.getString(R.string.pref_key_customize) -> {
|
||||||
SettingsFragmentDirections.actionSettingsFragmentToCustomizationFragment()
|
SettingsFragmentDirections.actionSettingsFragmentToCustomizationFragment()
|
||||||
}
|
}
|
||||||
|
@ -352,6 +359,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
||||||
findPreference<Preference>(
|
findPreference<Preference>(
|
||||||
getPreferenceKey(R.string.pref_key_debug_settings)
|
getPreferenceKey(R.string.pref_key_debug_settings)
|
||||||
)?.isVisible = requireContext().settings().showSecretDebugMenuThisSession
|
)?.isVisible = requireContext().settings().showSecretDebugMenuThisSession
|
||||||
|
|
||||||
|
findPreference<Preference>(
|
||||||
|
getPreferenceKey(R.string.pref_key_notifications)
|
||||||
|
)?.isVisible = requireContext().settings().showNotificationsSetting
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener {
|
private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener {
|
||||||
|
|
|
@ -279,6 +279,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
||||||
!trackingProtectionOnboardingShownThisSession)
|
!trackingProtectionOnboardingShownThisSession)
|
||||||
|
|
||||||
var showSecretDebugMenuThisSession = false
|
var showSecretDebugMenuThisSession = false
|
||||||
|
var showNotificationsSetting = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
|
||||||
|
|
||||||
val shouldShowSecurityPinWarningSync: Boolean
|
val shouldShowSecurityPinWarningSync: Boolean
|
||||||
get() = loginsSecureWarningSyncCount < showLoginsSecureWarningSyncMaxCount
|
get() = loginsSecureWarningSyncCount < showLoginsSecureWarningSyncMaxCount
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
<string name="pref_key_privacy_link" translatable="false">pref_key_privacy_link</string>
|
<string name="pref_key_privacy_link" translatable="false">pref_key_privacy_link</string>
|
||||||
<string name="pref_key_delete_browsing_data" translatable="false">pref_key_delete_browsing_data</string>
|
<string name="pref_key_delete_browsing_data" translatable="false">pref_key_delete_browsing_data</string>
|
||||||
<string name="pref_key_delete_browsing_data_on_quit_preference" translatable="false">pref_key_delete_browsing_data_on_quit_preference</string>
|
<string name="pref_key_delete_browsing_data_on_quit_preference" translatable="false">pref_key_delete_browsing_data_on_quit_preference</string>
|
||||||
|
<string name="pref_key_notifications" translatable="false">pref_key_notifications</string>
|
||||||
<string name="pref_key_delete_browsing_data_on_quit" translatable="false">pref_key_delete_browsing_data_on_quit</string>
|
<string name="pref_key_delete_browsing_data_on_quit" translatable="false">pref_key_delete_browsing_data_on_quit</string>
|
||||||
<string name="pref_key_delete_open_tabs_on_quit" translatable="false">pref_key_delete_open_tabs_on_quit</string>
|
<string name="pref_key_delete_open_tabs_on_quit" translatable="false">pref_key_delete_open_tabs_on_quit</string>
|
||||||
<string name="pref_key_delete_browsing_history_on_quit" translatable="false">pref_key_delete_browsing_history_on_quit</string>
|
<string name="pref_key_delete_browsing_history_on_quit" translatable="false">pref_key_delete_browsing_history_on_quit</string>
|
||||||
|
|
|
@ -300,6 +300,8 @@
|
||||||
<string name="preferences_external_download_manager">External download manager</string>
|
<string name="preferences_external_download_manager">External download manager</string>
|
||||||
<!-- Preference for add_ons -->
|
<!-- Preference for add_ons -->
|
||||||
<string name="preferences_addons">Add-ons</string>
|
<string name="preferences_addons">Add-ons</string>
|
||||||
|
<!-- Preference for notifications -->
|
||||||
|
<string name="preferences_notifications">Notifications</string>
|
||||||
|
|
||||||
<!-- Account Preferences -->
|
<!-- Account Preferences -->
|
||||||
<!-- Preference for triggering sync -->
|
<!-- Preference for triggering sync -->
|
||||||
|
|
|
@ -109,6 +109,11 @@
|
||||||
android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
|
android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
|
||||||
android:title="@string/preferences_delete_browsing_data_on_quit" />
|
android:title="@string/preferences_delete_browsing_data_on_quit" />
|
||||||
|
|
||||||
|
<androidx.preference.Preference
|
||||||
|
android:icon="@drawable/ic_notifications"
|
||||||
|
android:key="@string/pref_key_notifications"
|
||||||
|
android:title="@string/preferences_notifications" />
|
||||||
|
|
||||||
<androidx.preference.Preference
|
<androidx.preference.Preference
|
||||||
android:icon="@drawable/ic_data_collection"
|
android:icon="@drawable/ic_data_collection"
|
||||||
android:key="@string/pref_key_data_choices"
|
android:key="@string/pref_key_data_choices"
|
||||||
|
|
Loading…
Reference in New Issue