caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Clean up prefs.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-10-21 20:24:17 +02:00
parent 73d5db43ed
commit 300a4609f8
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/values/strings.xml
View file

@ -751,12 +751,9 @@
<string name="connectiontimedout">Connection timed out</string> <string name="connectiontimedout">Connection timed out</string>
<string name="bolusstopping">Stopping bolus delivery</string> <string name="bolusstopping">Stopping bolus delivery</string>
<string name="bolusstopped">Bolus delivery stopped</string> <string name="bolusstopped">Bolus delivery stopped</string>
<string name="key_combo_enable_experimental_features" translatable="false">combo_enable_experimental_features</string> <string name="key_combo_ignore_transient_errors" translatable="false">combo_ignore_transient_tbr_errors</string>
<string name="combo_enable_experimental_features">Enable experimental features</string> <string name="combo_ignore_transient_errors">Ignore transient errors</string>
<string name="combo_enable_experimental_features_summary">Unlocks experimental features which are in development and might be broken entirely.</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_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_disable_alarms" translatable="false">combo_disable_alerts</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">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> <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>

13
app/src/main/res/xml/pref_combo.xml
View file

@ -11,17 +11,10 @@
</Preference> </Preference>
<SwitchPreference <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/key_combo_enable_experimental_features" android:key="@string/key_combo_ignore_transient_errors"
android:title="@string/combo_enable_experimental_features" android:summary="@string/combo_ignore_transient_errors_summary"
android:summary="@string/combo_enable_experimental_features_summary" /> android:title="@string/combo_ignore_transient_errors" />
<SwitchPreference <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:defaultValue="false"
android:key="@string/key_combo_disable_alarms" android:key="@string/key_combo_disable_alarms"
android:title="@string/combo_disable_alarms" android:title="@string/combo_disable_alarms"