For #7957: Enable Login management preference for all users
parent
f52f87f6a4
commit
12ae46343e
|
@ -29,11 +29,6 @@ object FeatureFlags {
|
||||||
*/
|
*/
|
||||||
val progressiveWebApps = Config.channel.isNightlyOrDebug
|
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
|
* Disables FxA Application Services Web Channels feature
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -153,9 +153,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun updatePreferenceVisibilityForFeatureFlags() {
|
private fun updatePreferenceVisibilityForFeatureFlags() {
|
||||||
findPreference<Preference>(getPreferenceKey(R.string.pref_key_passwords))?.apply {
|
|
||||||
isVisible = FeatureFlags.logins
|
|
||||||
}
|
|
||||||
findPreference<Preference>(getPreferenceKey(R.string.pref_key_language))?.apply {
|
findPreference<Preference>(getPreferenceKey(R.string.pref_key_language))?.apply {
|
||||||
isVisible = FeatureFlags.fenixLanguagePicker
|
isVisible = FeatureFlags.fenixLanguagePicker
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ import mozilla.components.service.fxa.manager.SyncEnginesStorage
|
||||||
import mozilla.components.service.fxa.sync.SyncReason
|
import mozilla.components.service.fxa.sync.SyncReason
|
||||||
import mozilla.components.service.fxa.sync.SyncStatusObserver
|
import mozilla.components.service.fxa.sync.SyncStatusObserver
|
||||||
import mozilla.components.service.fxa.sync.getLastSynced
|
import mozilla.components.service.fxa.sync.getLastSynced
|
||||||
import org.mozilla.fenix.FeatureFlags
|
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
import org.mozilla.fenix.components.FenixSnackbar
|
import org.mozilla.fenix.components.FenixSnackbar
|
||||||
import org.mozilla.fenix.components.StoreProvider
|
import org.mozilla.fenix.components.StoreProvider
|
||||||
|
@ -256,7 +255,6 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
|
||||||
}
|
}
|
||||||
val loginsNameKey = getPreferenceKey(R.string.pref_key_sync_logins)
|
val loginsNameKey = getPreferenceKey(R.string.pref_key_sync_logins)
|
||||||
findPreference<CheckBoxPreference>(loginsNameKey)?.apply {
|
findPreference<CheckBoxPreference>(loginsNameKey)?.apply {
|
||||||
isVisible = FeatureFlags.logins
|
|
||||||
isEnabled = syncEnginesStatus.containsKey(SyncEngine.Passwords)
|
isEnabled = syncEnginesStatus.containsKey(SyncEngine.Passwords)
|
||||||
isChecked = syncEnginesStatus.getOrElse(SyncEngine.Passwords) { false }
|
isChecked = syncEnginesStatus.getOrElse(SyncEngine.Passwords) { false }
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,12 +29,11 @@
|
||||||
<androidx.preference.CheckBoxPreference
|
<androidx.preference.CheckBoxPreference
|
||||||
android:defaultValue="false"
|
android:defaultValue="false"
|
||||||
android:key="@string/pref_key_sync_logins"
|
android:key="@string/pref_key_sync_logins"
|
||||||
android:title="@string/preferences_sync_logins"
|
android:title="@string/preferences_sync_logins" />
|
||||||
app:isPreferenceVisible="false" />
|
|
||||||
|
|
||||||
<androidx.preference.EditTextPreference
|
<androidx.preference.EditTextPreference
|
||||||
android:key="@string/pref_key_sync_device_name"
|
android:key="@string/pref_key_sync_device_name"
|
||||||
android:title="@string/preferences_sync_device_name" />
|
android:title="@string/preferences_sync_device_name" />
|
||||||
|
|
||||||
</androidx.preference.PreferenceCategory>
|
</androidx.preference.PreferenceCategory>
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
|
|
@ -42,7 +42,6 @@
|
||||||
android:title="@string/preferences_customize" />
|
android:title="@string/preferences_customize" />
|
||||||
|
|
||||||
<androidx.preference.Preference
|
<androidx.preference.Preference
|
||||||
app:isPreferenceVisible="false"
|
|
||||||
android:icon="@drawable/ic_login"
|
android:icon="@drawable/ic_login"
|
||||||
android:key="@string/pref_key_passwords"
|
android:key="@string/pref_key_passwords"
|
||||||
android:title="@string/preferences_passwords_logins_and_passwords" />
|
android:title="@string/preferences_passwords_logins_and_passwords" />
|
||||||
|
|
Loading…
Reference in New Issue