AndroidAPS/app/src/main/res/xml
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
..
pref_absorption_aaps.xml sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
pref_absorption_oref0.xml sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
pref_advanced.xml sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
pref_age.xml age from product flavor to prefs 2017-02-22 20:29:41 +01:00
pref_careportal.xml careportal 2016-07-02 23:58:57 +02:00
pref_closedmode.xml DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
pref_combo.xml Remove the alerter and related prefs. 2017-10-25 16:27:55 +02:00
pref_danar.xml Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
pref_danarkorean.xml Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
pref_danarprofile.xml DanaRv2 1st rev 2017-04-30 21:08:00 +02:00
pref_danars.xml partial bolus code, messages blocked by sleep :( 2017-09-14 22:53:11 +02:00
pref_danarv2.xml Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
pref_insulinoreffreepeak.xml insulincurves - rename peak to peak time 2017-08-14 16:02:07 +02:00
pref_language.xml DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
pref_nsclientinternal.xml local broadcasts better setting title 2017-07-18 22:18:10 +02:00
pref_openapsama.xml preferences update 2017-11-01 20:43:59 +01:00
pref_openapsma.xml Use target ranges from profile, rather than fixed values from prefs. 2017-07-18 13:04:15 +02:00
pref_others.xml Remove debris of localalerts to make upstream re-integration only a minor PITA, maybe. 2017-11-11 16:15:03 +01:00
pref_password.xml settings password protected 2017-02-14 19:16:34 +01:00
pref_profile.xml sync profile to pump 2017-01-28 23:45:14 +01:00
pref_quickwizard.xml QuickWizard 2016-10-20 23:50:31 +02:00
pref_safety.xml preferences update 2017-11-01 20:43:59 +01:00
pref_smscommunicator.xml fix sms pref key 2017-04-09 21:50:05 +02:00
pref_virtualpump.xml virtual pump status upload optional 2017-02-14 15:41:30 +01:00
pref_wear.xml remove deprecated wear notification settings 2017-11-06 21:44:01 +01:00
pref_xdripstatus.xml bgi on watch status (optional) 2017-05-09 23:23:37 +02:00