Merge branch 'V3.4' into V3.5

2020-08-22 11:13:49 +01:00
parent 9047a86544 b924519dd2
commit 47d6df65a0
19 changed files with 1643 additions and 720 deletions
--- a/app/src/main/res/xml/general_prefs.xml
+++ b/app/src/main/res/xml/general_prefs.xml
@@ -8,6 +8,12 @@
        android:entryValues="@array/datasource_list_values"
        android:defaultValue="Garmin"
        android:dialogTitle="Select Data Source" />
+    <Preference
+        android:key="SelectBLEDevice"
+        android:title="@string/select_ble_device_title"
+        android:summary="@string/select_ble_device_desc"
+        android:widgetLayout="@layout/pref_select_ble_device_button"
+        />
    <CheckBoxPreference
        android:defaultValue="true"
        android:key="LogAlarms"