Johannes Mockenhaupt d92540a17c Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 ... * adrian/localalerts-settings: remove already commented out code upper case literals use correct setting Don't alarm while disconnected disconnect state remove deprecated wear notification settings no-urgent notification title presnooze missed readings/pump on startup system notifications for non-urgent Notification bugfixes use ID as request code guard double clicks refactor notifications: subpackage initialized only when maxBasal >0 Dismiss notification service local alert thresholds as settings Extract local alerts for unreachable pump, missed BG readings. # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/res/values/strings.xml		2017-11-18 16:42:20 +01:00
..
libs	first rhino	2017-10-15 02:52:57 +02:00
src	Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2	2017-11-18 16:42:20 +01:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Some ComboFragment cleanups.	2017-11-08 23:31:40 +01:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00