diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt
index d28d16239..02356f02a 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt
@@ -63,11 +63,15 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), CoroutineScope {
override fun onProfileUpdated(profile: Profile) {}
}
+ override fun onResume() {
+ super.onResume()
+ (activity as AppCompatActivity).title = getString(R.string.preferences_account_settings)
+ (activity as AppCompatActivity).supportActionBar?.show()
+ }
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
job = Job()
- (activity as AppCompatActivity).title = getString(R.string.preferences_account_settings)
- (activity as AppCompatActivity).supportActionBar?.show()
requireComponents.analytics.metrics.track(Event.SyncAccountOpened)
}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
index d28ef5537..635d373ff 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
@@ -30,14 +30,17 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- (activity as AppCompatActivity).title = getString(R.string.preferences_data_choices)
- (activity as AppCompatActivity).supportActionBar?.show()
-
context?.let {
preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
}
}
+ override fun onResume() {
+ super.onResume()
+ (activity as AppCompatActivity).title = getString(R.string.preferences_data_choices)
+ (activity as AppCompatActivity).supportActionBar?.show()
+ }
+
override fun onDestroy() {
context?.let {
preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener)
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 322de0cf6..ef38404ce 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -295,7 +295,7 @@
+ android:label="@string/preferences_data_choices" />
+ android:label="@string/preferences_accessibility" />
+ android:label="@string/preferences_account_settings" />
+ android:label="@string/preferences_search_engine" />
+ android:label="@string/preferences_sync">
+ android:label="@string/preferences_theme" />
+ android:label="@string/preferences_delete_browsing_data">
+ android:label="@string/preference_exceptions" />