blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #7957: Enable Login management preference for all users

master
ValentinTimisica 2020-01-28 15:31:44 +02:00 committed by Emily Kager
parent f52f87f6a4
commit 12ae46343e
5 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
View File

@ -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
*/

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

@ -153,9 +153,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
}
private fun updatePreferenceVisibilityForFeatureFlags() {
findPreference<Preference>(getPreferenceKey(R.string.pref_key_passwords))?.apply {
isVisible = FeatureFlags.logins
}
findPreference<Preference>(getPreferenceKey(R.string.pref_key_language))?.apply {
isVisible = FeatureFlags.fenixLanguagePicker
}

2
app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
View File

@ -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<CheckBoxPreference>(loginsNameKey)?.apply {
isVisible = FeatureFlags.logins
isEnabled = syncEnginesStatus.containsKey(SyncEngine.Passwords)
isChecked = syncEnginesStatus.getOrElse(SyncEngine.Passwords) { false }
}

5
app/src/main/res/xml/account_settings_preferences.xml
View File

@ -29,12 +29,11 @@
<androidx.preference.CheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_key_sync_logins"
android:title="@string/preferences_sync_logins"
app:isPreferenceVisible="false" />
android:title="@string/preferences_sync_logins" />
<androidx.preference.EditTextPreference
android:key="@string/pref_key_sync_device_name"
android:title="@string/preferences_sync_device_name" />
</androidx.preference.PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>

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

@ -42,7 +42,6 @@
android:title="@string/preferences_customize" />
<androidx.preference.Preference
app:isPreferenceVisible="false"
android:icon="@drawable/ic_login"
android:key="@string/pref_key_passwords"
android:title="@string/preferences_passwords_logins_and_passwords" />