From 300a4609f897be21700691add2d1f3afc2c5dc2e Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 21 Oct 2017 20:24:17 +0200
Subject: [PATCH] Clean up prefs.

---
 app/src/main/res/values/strings.xml |  9 +++------
 app/src/main/res/xml/pref_combo.xml | 13 +++----------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6703669fb1..f9c96fb229 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -751,12 +751,9 @@
     <string name="connectiontimedout">Connection timed out</string>
     <string name="bolusstopping">Stopping bolus delivery</string>
     <string name="bolusstopped">Bolus delivery stopped</string>
-    <string name="key_combo_enable_experimental_features" translatable="false">combo_enable_experimental_features</string>
-    <string name="combo_enable_experimental_features">Enable experimental features</string>
-    <string name="combo_enable_experimental_features_summary">Unlocks experimental features which are in development and might be broken entirely.</string>
-    <string name="key_combo_experimental_ignore_transient_errors" translatable="false">combo_ignore_transient_tbr_errors</string>
-    <string name="combo_experimental_ignore_transient_errors">Ignore transient errors</string>
-    <string name="combo_experimental_ignore_transient_errors_summary">Ignore a connect failure for a background operation unless the next attempt also fails.</string>
+    <string name="key_combo_ignore_transient_errors" translatable="false">combo_ignore_transient_tbr_errors</string>
+    <string name="combo_ignore_transient_errors">Ignore transient errors</string>
+    <string name="combo_ignore_transient_errors_summary">Ignore a connect failure for a background operation unless the next attempt also fails.</string>
     <string name="key_combo_disable_alarms" translatable="false">combo_disable_alerts</string>
     <string name="combo_disable_alarms">Disable alarms</string>
     <string name="combo_disable_alarms_summary">Ignore all errors encountered while communicating with the pump. Alarms raised by the pump (including those caused by AndroidAPS) will still be raised on the pump.</string>
diff --git a/app/src/main/res/xml/pref_combo.xml b/app/src/main/res/xml/pref_combo.xml
index c53fe01812..5c44face05 100644
--- a/app/src/main/res/xml/pref_combo.xml
+++ b/app/src/main/res/xml/pref_combo.xml
@@ -11,17 +11,10 @@
         </Preference>
         <SwitchPreference
             android:defaultValue="false"
-            android:key="@string/key_combo_enable_experimental_features"
-            android:title="@string/combo_enable_experimental_features"
-            android:summary="@string/combo_enable_experimental_features_summary" />
+            android:key="@string/key_combo_ignore_transient_errors"
+            android:summary="@string/combo_ignore_transient_errors_summary"
+            android:title="@string/combo_ignore_transient_errors" />
         <SwitchPreference
-            android:dependency="@string/key_combo_enable_experimental_features"
-            android:defaultValue="false"
-            android:key="@string/key_combo_experimental_ignore_transient_errors"
-            android:summary="@string/combo_experimental_ignore_transient_errors_summary"
-            android:title="@string/combo_experimental_ignore_transient_errors" />
-        <SwitchPreference
-            android:dependency="@string/key_combo_enable_experimental_features"
             android:defaultValue="false"
             android:key="@string/key_combo_disable_alarms"
             android:title="@string/combo_disable_alarms"