diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index c286ee61a..6ece8b47d 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -29,11 +29,6 @@ object FeatureFlags { */ val progressiveWebApps = Config.channel.isNightlyOrDebug - /** - * Gives option in Settings to see logins and sync logins - */ - val logins = Config.channel.isNightlyOrDebug - /** * Disables FxA Application Services Web Channels feature */ diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt index 8033c5dbe..d1c33372b 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -153,9 +153,6 @@ class SettingsFragment : PreferenceFragmentCompat() { } private fun updatePreferenceVisibilityForFeatureFlags() { - findPreference(getPreferenceKey(R.string.pref_key_passwords))?.apply { - isVisible = FeatureFlags.logins - } findPreference(getPreferenceKey(R.string.pref_key_language))?.apply { isVisible = FeatureFlags.fenixLanguagePicker } diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt index 02bc1875d..6a04a2b8c 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt @@ -33,7 +33,6 @@ import mozilla.components.service.fxa.manager.SyncEnginesStorage import mozilla.components.service.fxa.sync.SyncReason import mozilla.components.service.fxa.sync.SyncStatusObserver import mozilla.components.service.fxa.sync.getLastSynced -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.StoreProvider @@ -256,7 +255,6 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { } val loginsNameKey = getPreferenceKey(R.string.pref_key_sync_logins) findPreference(loginsNameKey)?.apply { - isVisible = FeatureFlags.logins isEnabled = syncEnginesStatus.containsKey(SyncEngine.Passwords) isChecked = syncEnginesStatus.getOrElse(SyncEngine.Passwords) { false } } diff --git a/app/src/main/res/xml/account_settings_preferences.xml b/app/src/main/res/xml/account_settings_preferences.xml index 104b4c7e0..2e49f6668 100644 --- a/app/src/main/res/xml/account_settings_preferences.xml +++ b/app/src/main/res/xml/account_settings_preferences.xml @@ -29,12 +29,11 @@ + android:title="@string/preferences_sync_logins" /> - \ No newline at end of file + diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index bd1c53b76..fe638238d 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -42,7 +42,6 @@ android:title="@string/preferences_customize" />