Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref

This commit is contained in:
Tim Gunn 2020-04-05 23:04:49 +12:00
commit 91e36e01ba
No known key found for this signature in database
GPG key ID: C9BC1E9D0D0AED8C

View file

@ -73,7 +73,7 @@
android:summary="@string/enablesmbaftercarbs_summary" android:summary="@string/enablesmbaftercarbs_summary"
android:title="@string/enablesmbaftercarbs" /> android:title="@string/enablesmbaftercarbs" />
<com.andreabaccega.widget.ValidatingEditTextPreference <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
android:defaultValue="3" android:defaultValue="3"
android:digits="0123456789" android:digits="0123456789"
android:inputType="number" android:inputType="number"
@ -86,14 +86,14 @@
validate:minNumber="1" validate:minNumber="1"
validate:testType="numericRange" /> validate:testType="numericRange" />
<com.andreabaccega.widget.ValidatingEditTextPreference <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
android:defaultValue="30" android:defaultValue="30"
android:entries="@array/smbMaxMinutes" android:entries="@array/smbMaxMinutes"
android:entryValues="@array/smbMaxMinutes" android:entryValues="@array/smbMaxMinutes"
android:key="@string/key_smbmaxminutes" android:key="@string/key_smbmaxminutes"
android:title="@string/smbmaxminutes_summary" /> android:title="@string/smbmaxminutes_summary" />
<com.andreabaccega.widget.ValidatingEditTextPreference <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
android:defaultValue="30" android:defaultValue="30"
android:dialogMessage="@string/uamsmbmaxminutes" android:dialogMessage="@string/uamsmbmaxminutes"
android:digits="0123456789" android:digits="0123456789"
@ -143,7 +143,7 @@
android:summary="@string/low_temptarget_lowers_sensitivity_summary" android:summary="@string/low_temptarget_lowers_sensitivity_summary"
android:title="@string/low_temptarget_lowers_sensitivity_title" /> android:title="@string/low_temptarget_lowers_sensitivity_title" />
<com.andreabaccega.widget.ValidatingEditTextPreference <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
android:key="@string/key_carbsReqThreshold" android:key="@string/key_carbsReqThreshold"
android:title="@string/carbsReqThreshold" android:title="@string/carbsReqThreshold"
android:defaultValue="1" android:defaultValue="1"