blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Modify the order of Privacy Policy and About in Settings (#2760)

master
afr30010 2019-07-08 18:16:18 +01:00 committed by Colin Lee
parent 45cfeb858b
commit c92eabdd64
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View File

@ -41,7 +41,7 @@ import org.mozilla.fenix.R.string.pref_key_help
import org.mozilla.fenix.R.string.pref_key_language
import org.mozilla.fenix.R.string.pref_key_leakcanary
import org.mozilla.fenix.R.string.pref_key_make_default_browser
import org.mozilla.fenix.R.string.pref_key_privacy_notice
import org.mozilla.fenix.R.string.pref_key_privacy_link
import org.mozilla.fenix.R.string.pref_key_rate
import org.mozilla.fenix.R.string.pref_key_remote_debugging
import org.mozilla.fenix.R.string.pref_key_search_engine_settings
@ -196,7 +196,7 @@ class SettingsFragment : PreferenceFragmentCompat(), AccountObserver {
resources.getString(pref_key_theme) -> {
navigateToThemeSettings()
}
resources.getString(pref_key_privacy_notice) -> {
resources.getString(pref_key_privacy_link) -> {
requireContext().apply {
val intent = SupportUtils.createCustomTabIntent(this, SupportUtils.PRIVACY_NOTICE_URL)
startActivity(intent)

2
app/src/main/res/values/preference_keys.xml
View File

@ -13,12 +13,12 @@
<string name="pref_key_accessibility_font_scale" translatable="false">pref_key_accessibility_font_scale</string>
<string name="pref_key_language" translatable="false">pref_key_language</string>
<string name="pref_key_data_choices" translatable="false">pref_key_data_choices</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_help" translatable="false">pref_key_help</string>
<string name="pref_key_rate" translatable="false">pref_key_rate</string>
<string name="pref_key_feedback" translatable="false">pref_key_feedback</string>
<string name="pref_key_about" translatable="false">pref_key_about</string>
<string name="pref_key_privacy_notice" translatable="false">pref_key_privacy_notice</string>
<string name="pref_key_your_rights" translatable="false">pref_key_your_rights</string>
<string name="pref_key_account" translatable="false">pref_key_account</string>
<string name="pref_key_sign_in" translatable="false">pref_key_sign_in</string>

4
app/src/main/res/values/strings.xml
View File

@ -101,8 +101,6 @@
<!-- Preference linking to about page for Fenix
The first parameter is the name of the app defined in app_name (for example: Fenix) -->
<string name="preferences_about">About %1$s</string>
<!-- Preference linking to the privacy notice -->
<string name="preferences_privacy_notice">Privacy Notice</string>
<!-- Preference linking to the your rights SUMO page -->
<string name="preferences_your_rights">Your Rights</string>
<!-- Preference for settings related to saved passwords -->
@ -133,6 +131,8 @@
<string name="preferences_language">Language</string>
<!-- Preference for data choices -->
<string name="preferences_data_choices">Data choices</string>
<!-- Preference linking to the privacy notice -->
<string name="preferences_privacy_link">Privacy notice</string>
<!-- Preference category for developer tools -->
<string name="developer_tools_category">Developer tools</string>
<!-- Preference for developers -->

6
app/src/main/res/xml/preferences.xml
View File

@ -70,6 +70,9 @@
android:icon="@drawable/ic_data_collection"
android:key="@string/pref_key_data_choices"
android:title="@string/preferences_data_choices" />
<androidx.preference.Preference
android:key="@string/pref_key_privacy_link"
android:title="@string/preferences_privacy_link" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:icon="@drawable/ic_info"
@ -103,8 +106,5 @@
android:icon="@drawable/ic_info"
android:key="@string/pref_key_about"
android:title="@string/preferences_about" />
<androidx.preference.Preference
android:key="@string/pref_key_privacy_notice"
android:title="@string/preferences_privacy_notice" />
</androidx.preference.PreferenceCategory>
</androidx.preference.PreferenceScreen>