Merge branch 'V2.5' into V2.6

2017-12-07 05:59:26 +00:00
parent 37f759fa5d ef1c73905b
commit ec34c2fe03
31 changed files with 66 additions and 16 deletions
--- a/app/src/main/res/xml/alarm_prefs.xml
+++ b/app/src/main/res/xml/alarm_prefs.xml
@@ -36,6 +36,11 @@
            android:summary="Duration that fault alarms are muted before initiating."
            android:numeric="integer"
            android:defaultValue="30" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="UseMp3Alarm"
+            android:summary="Play an MP3 file to create the alarm beeps rather than using the default tone generator."
+            android:title="Use MP3 Alarm Sound" />

    </PreferenceCategory>