From 1cf8a400596c89bac428c2a5dd704408ce492add Mon Sep 17 00:00:00 2001
From: Emily Kager <emilykager@gmail.com>
Date: Tue, 27 Aug 2019 15:56:16 -0400
Subject: [PATCH] For #4295 - Adds Experiments Pref to Data Collection Settings
 (#4915)

---
 .../main/java/org/mozilla/fenix/FenixApplication.kt  | 12 +++++++-----
 .../mozilla/fenix/settings/DataChoicesFragment.kt    |  5 +++++
 .../main/java/org/mozilla/fenix/utils/Settings.kt    |  5 +++++
 app/src/main/res/values/preference_keys.xml          |  1 +
 app/src/main/res/xml/data_choices_preferences.xml    |  5 +++++
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index ab9ee7db2..1772ed25c 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -74,12 +74,14 @@ open class FenixApplication : Application() {
         experimentLoader = loadExperiments()
 
         // Enable the service-experiments component
-        Experiments.initialize(
-            applicationContext,
-            mozilla.components.service.experiments.Configuration(
-                httpClient = lazy(LazyThreadSafetyMode.NONE) { components.core.client }
+        if (Settings.getInstance(this).isExperimentationEnabled) {
+            Experiments.initialize(
+                applicationContext,
+                mozilla.components.service.experiments.Configuration(
+                    httpClient = lazy(LazyThreadSafetyMode.NONE) { components.core.client }
+                )
             )
-        )
+        }
 
         // When the `fenix-test-2019-08-05` experiment is active, record its branch in Glean
         // telemetry. This will be used to validate that the experiment system correctly enrolls
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
index 78f18813e..31d2cfb30 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
@@ -63,5 +63,10 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
 
             onPreferenceChangeListener = SharedPreferenceUpdater()
         }
+
+        findPreference<SwitchPreference>(getPreferenceKey(R.string.pref_key_experimentation))?.apply {
+            isChecked = Settings.getInstance(context).isExperimentationEnabled
+            onPreferenceChangeListener = SharedPreferenceUpdater()
+        }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index f7cbb4641..057cba83b 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -90,6 +90,11 @@ class Settings private constructor(
         default = true
     )
 
+    val isExperimentationEnabled by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_experimentation),
+        default = true
+    )
+
     val shouldAutoBounceQuickActionSheet: Boolean
         get() = autoBounceQuickActionSheetCount < autoBounceMaximumCount
 
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 74af3953a..da1a71a8d 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -27,6 +27,7 @@
     <string name="pref_key_theme" translatable="false">pref_key_theme</string>
     <string name="pref_key_leakcanary" translatable="false">pref_key_leakcanary</string>
     <string name="pref_key_remote_debugging" translatable="false">pref_key_remote_debugging</string>
+    <string name="pref_key_experimentation" translatable="false">pref_key_experimentation</string>
 
     <!-- Data Choices -->
     <string name="pref_key_telemetry" translatable="false">pref_key_telemetry</string>
diff --git a/app/src/main/res/xml/data_choices_preferences.xml b/app/src/main/res/xml/data_choices_preferences.xml
index 4a3783d69..3bb80773f 100644
--- a/app/src/main/res/xml/data_choices_preferences.xml
+++ b/app/src/main/res/xml/data_choices_preferences.xml
@@ -9,4 +9,9 @@
         android:summary="@string/preferences_usage_data_description"
         android:title="@string/preference_usage_data"
         app:iconSpaceReserved="false" />
+    <androidx.preference.SwitchPreference
+        android:key="@string/pref_key_experimentation"
+        android:summary="@string/preference_experiments_summary"
+        android:title="@string/preference_experiments"
+        app:iconSpaceReserved="false" />
 </PreferenceScreen>