14 commits

Author	SHA1	Message	Date
Andy Rozman	f7395c7a2c	Changes after merge, compilable, but medtronic is still in old structure.	2019-03-02 20:24:53 +00:00
Andy Rozman	289902633e	Merge branch 'dev' into medtronic_andy	2019-03-02 18:20:37 +00:00
Milos Kozak	d9a9c933bc	package refactor	2019-02-28 23:16:50 +01:00
Milos Kozak	395faa7dc9	pumps package refactor	2019-02-26 20:38:27 +01:00
Milos Kozak	b0dd2f464b	Insight driver (Sight remote) removal	2019-02-25 19:33:01 +01:00
Andy Rozman	5aa5d9f749	Merge branch 'dev' into medtronic_andy	2019-02-16 20:50:36 +00:00
Nico Schmitz	9e03f0f8ca	Update to current dev branch	2018-12-11 14:51:26 +01:00
Andy Rozman	ca536ee97e	[0.3.1] ... - removed code that sends wakeup on every command - added checking if device is present - fixed reading data when no data present (PostProcessingUI) - work done on showing hardware in configuration (added RileyLinkSelectPreference) - fixing configuration (in wizard)	2018-10-20 13:24:36 +01:00
Andy Rozman	da75ed643d	Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable	2018-09-14 18:14:45 +01:00
Milos Kozak	f7269a806d	nsclient allow general preferences	2018-09-11 20:08:59 +02:00
Nico Schmitz	5386c7db4a	Update to upstream/dev and resolve conflicts	2018-08-19 14:37:42 +02:00
Milos Kozak	fff2e84608	remove g5uploader flavor	2018-08-07 21:45:35 +02:00
Milos Kozak	fcf47ecc03	NSClient2 flavor	2018-08-07 21:07:43 +02:00
Milos Kozak	75bb38ba1f	move activities to new package	2018-07-29 00:08:28 +02:00

Renamed from app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java (Browse further)