parent
9c63c59ea9
commit
d168d52516
|
@ -51,12 +51,9 @@ class TurnOnSyncFragment : PreferenceFragmentCompat(), AccountObserver {
|
||||||
|
|
||||||
val preferenceSignIn =
|
val preferenceSignIn =
|
||||||
findPreference<Preference>(context!!.getPreferenceKey(R.string.pref_key_sync_sign_in))
|
findPreference<Preference>(context!!.getPreferenceKey(R.string.pref_key_sync_sign_in))
|
||||||
val preferenceNewAccount =
|
|
||||||
findPreference<Preference>(context!!.getPreferenceKey(R.string.pref_key_sync_create_account))
|
|
||||||
val preferencePairSignIn =
|
val preferencePairSignIn =
|
||||||
findPreference<Preference>(context!!.getPreferenceKey(R.string.pref_key_sync_pair))
|
findPreference<Preference>(context!!.getPreferenceKey(R.string.pref_key_sync_pair))
|
||||||
preferenceSignIn?.onPreferenceClickListener = getClickListenerForSignIn()
|
preferenceSignIn?.onPreferenceClickListener = getClickListenerForSignIn()
|
||||||
preferenceNewAccount?.onPreferenceClickListener = getClickListenerForCreateAccount()
|
|
||||||
preferencePairSignIn?.onPreferenceClickListener = getClickListenerForPairing()
|
preferencePairSignIn?.onPreferenceClickListener = getClickListenerForPairing()
|
||||||
preferencePairSignIn?.isVisible = context?.hasCamera() ?: true
|
preferencePairSignIn?.isVisible = context?.hasCamera() ?: true
|
||||||
|
|
||||||
|
@ -79,15 +76,6 @@ class TurnOnSyncFragment : PreferenceFragmentCompat(), AccountObserver {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getClickListenerForCreateAccount(): Preference.OnPreferenceClickListener {
|
|
||||||
// Currently the same as sign in, as FxA handles this, however we want to emit a different telemetry event
|
|
||||||
return Preference.OnPreferenceClickListener {
|
|
||||||
requireComponents.services.accountsAuthFeature.beginAuthentication(requireContext())
|
|
||||||
requireComponents.analytics.metrics.track(Event.SyncAuthCreateAccount)
|
|
||||||
true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun getClickListenerForPairing(): Preference.OnPreferenceClickListener {
|
private fun getClickListenerForPairing(): Preference.OnPreferenceClickListener {
|
||||||
return Preference.OnPreferenceClickListener {
|
return Preference.OnPreferenceClickListener {
|
||||||
val directions = TurnOnSyncFragmentDirections.actionTurnOnSyncFragmentToPairInstructionsFragment()
|
val directions = TurnOnSyncFragmentDirections.actionTurnOnSyncFragmentToPairInstructionsFragment()
|
||||||
|
|
|
@ -212,8 +212,6 @@
|
||||||
<string name="preferences_sync_pair">Scan pairing code in desktop Firefox</string>
|
<string name="preferences_sync_pair">Scan pairing code in desktop Firefox</string>
|
||||||
<!-- Preference for account login -->
|
<!-- Preference for account login -->
|
||||||
<string name="preferences_sync_sign_in">Sign in</string>
|
<string name="preferences_sync_sign_in">Sign in</string>
|
||||||
<!-- Preference for account creation -->
|
|
||||||
<string name="preferences_sync_create_account">Create an account</string>
|
|
||||||
<!-- Preference for reconnecting to FxA sync -->
|
<!-- Preference for reconnecting to FxA sync -->
|
||||||
<string name="preferences_sync_sign_in_to_reconnect">Sign in to reconnect</string>
|
<string name="preferences_sync_sign_in_to_reconnect">Sign in to reconnect</string>
|
||||||
<!-- Preference for removing FxA account -->
|
<!-- Preference for removing FxA account -->
|
||||||
|
|
|
@ -2,19 +2,13 @@
|
||||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
|
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
||||||
<androidx.preference.Preference
|
<androidx.preference.Preference
|
||||||
|
android:icon="@drawable/ic_qr"
|
||||||
android:key="@string/pref_key_sync_pair"
|
android:key="@string/pref_key_sync_pair"
|
||||||
android:title="@string/preferences_sync_pair"
|
android:title="@string/preferences_sync_pair" />
|
||||||
android:icon="@drawable/ic_qr" />
|
|
||||||
<androidx.preference.Preference
|
<androidx.preference.Preference
|
||||||
|
android:icon="@drawable/ic_sign_in"
|
||||||
android:key="@string/pref_key_sync_sign_in"
|
android:key="@string/pref_key_sync_sign_in"
|
||||||
android:title="@string/preferences_sync"
|
android:title="@string/preferences_sync" />
|
||||||
android:icon="@drawable/ic_sign_in" />
|
|
||||||
<androidx.preference.Preference
|
|
||||||
android:key="@string/pref_key_sync_create_account"
|
|
||||||
android:title="@string/preferences_sync_create_account"
|
|
||||||
android:icon="@drawable/ic_new" />
|
|
||||||
</androidx.preference.PreferenceScreen>
|
</androidx.preference.PreferenceScreen>
|
||||||
|
|
Loading…
Reference in New Issue