From d168d5251644cc075936ffcef8ad9cd239b000f3 Mon Sep 17 00:00:00 2001
From: Emily Kager <emilykager@gmail.com>
Date: Mon, 8 Jul 2019 10:07:09 -0700
Subject: [PATCH] For #3772 - Remove Create an Account Option on
 TurnOnSyncFragment (#3928)

---
 .../mozilla/fenix/settings/TurnOnSyncFragment.kt | 12 ------------
 app/src/main/res/values/strings.xml              |  2 --
 .../main/res/xml/turn_on_sync_preferences.xml    | 16 +++++-----------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
index 012505076..08b4e671d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
@@ -51,12 +51,9 @@ class TurnOnSyncFragment : PreferenceFragmentCompat(), AccountObserver {
 
         val preferenceSignIn =
             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 =
             findPreference<Preference>(context!!.getPreferenceKey(R.string.pref_key_sync_pair))
         preferenceSignIn?.onPreferenceClickListener = getClickListenerForSignIn()
-        preferenceNewAccount?.onPreferenceClickListener = getClickListenerForCreateAccount()
         preferencePairSignIn?.onPreferenceClickListener = getClickListenerForPairing()
         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 {
         return Preference.OnPreferenceClickListener {
             val directions = TurnOnSyncFragmentDirections.actionTurnOnSyncFragmentToPairInstructionsFragment()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c290952d6..bf35fe789 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -212,8 +212,6 @@
     <string name="preferences_sync_pair">Scan pairing code in desktop Firefox</string>
     <!-- Preference for account login -->
     <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 -->
     <string name="preferences_sync_sign_in_to_reconnect">Sign in to reconnect</string>
     <!-- Preference for removing FxA account -->
diff --git a/app/src/main/res/xml/turn_on_sync_preferences.xml b/app/src/main/res/xml/turn_on_sync_preferences.xml
index 38ea8da2f..d6b3737fc 100644
--- a/app/src/main/res/xml/turn_on_sync_preferences.xml
+++ b/app/src/main/res/xml/turn_on_sync_preferences.xml
@@ -2,19 +2,13 @@
 <!-- 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
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <androidx.preference.Preference
+        android:icon="@drawable/ic_qr"
         android:key="@string/pref_key_sync_pair"
-        android:title="@string/preferences_sync_pair"
-        android:icon="@drawable/ic_qr" />
+        android:title="@string/preferences_sync_pair" />
     <androidx.preference.Preference
+        android:icon="@drawable/ic_sign_in"
         android:key="@string/pref_key_sync_sign_in"
-        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" />
+        android:title="@string/preferences_sync" />
 </androidx.preference.PreferenceScreen>