Merge branch 'V4.0.x' into V4.1.x

This commit is contained in:
Graham Jones
2022-10-26 23:08:21 +01:00
17 changed files with 367 additions and 47 deletions

View File

@@ -11,7 +11,7 @@
android:summary="@string/log_data_summary"
android:title="@string/log_data_title" /> -->
<EditTextPreference
android:defaultValue="150"
android:defaultValue="180"
android:key="EventDurationSec"
android:summary="@string/eventDurationSummary"
android:title="@string/eventDurationTitle" />
@@ -35,6 +35,11 @@
android:key="LogDataRemoteMobile"
android:summary="@string/log_data_remote_mobile_summary"
android:title="@string/log_data_remote_mobile_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="LogNDA"
android:summary="@string/LogNDASummary"
android:title="@string/LogNDATitle" />
<!--<EditTextPreference
android:defaultValue="60"
android:key="RemoteLogPeriod"