Johannes Mockenhaupt e7d49f2300 Merge branch 'no-history-for-you' into combo-scripter-v2 ... * no-history-for-you: When bolusing, only read history in case of error or cancellation. Cleanups. Remove lastBolus, reservoirLevel. Use timestamp for TBR, not pump minutes. Rework checkAndResolveTbrMismatch to update from pump to AAPS only. ComboFragment: move forced history read to long-pressing the TDD button. More steps towards reducing comms amount. Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. Remove last bolus, units display of reservoir level from Combo fragment. # Conflicts: # app/src/main/res/values/strings.xml		2017-12-05 00:34:22 +01:00
..
assets	Revert "Debug: wider thread column in log to improve readability."	2017-10-26 16:54:46 +02:00
java	Merge branch 'no-history-for-you' into combo-scripter-v2	2017-12-05 00:34:22 +01:00
jniLibs	initial RS work	2017-09-13 00:35:03 +02:00
res	Merge branch 'no-history-for-you' into combo-scripter-v2	2017-12-05 00:34:22 +01:00
AndroidManifest.xml	Remove combo pairing stubs.	2017-12-03 22:47:55 +01:00