AndroidAPS/app/src/main/java/info/nightscout/androidaps
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
..
data Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 2017-11-18 16:42:20 +01:00
db Lots of work around properly reading pump history. 2017-11-13 23:05:49 +01:00
events Better log messages for events. 2017-10-26 16:54:46 +02:00
interfaces wip 2017-11-08 10:43:11 +01:00
plugins Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 2017-11-18 16:42:20 +01:00
receivers Revert more local alerts 2017-11-11 16:29:46 +01:00
Services refactor notifications: subpackage 2017-11-06 14:26:06 +01:00
tabs fix crash in instantiating fragment 2017-06-30 09:46:56 +02:00
AgreementActivity.java age from product flavor to prefs 2017-02-22 20:29:41 +01:00
Config.java Merge remote-tracking branch 'origin/dev2' into combo-v2 2017-11-01 21:39:45 +01:00
Constants.java KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode. 2017-10-30 16:20:08 +01:00
MainActivity.java preferences update 2017-11-01 20:43:59 +01:00
MainApp.java Merge remote-tracking branch 'origin/dev2' into combo-v2 2017-11-01 21:39:45 +01:00
PreferencesActivity.java Fix NPE initialising MyPreferencesFragment, part 2 2017-11-08 15:07:10 +01:00