Commit graph

6253 commits

Author SHA1 Message Date
Nico Schmitz 4d98c44d74 Fix tests 2019-03-25 23:35:42 +01:00
Nico Schmitz 039c8eec3a Merge dev branch 2019-03-22 23:20:53 +01:00
Nico Schmitz fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +01:00
Nico Schmitz f017b7a7a2 Work on automation plugin.
- Remove unused imports
- Add icons for actions and triggers
2019-03-21 23:38:56 +01:00
Milos Kozak 751e87ca5e
Merge pull request #1688 from AdrianLxM/dev-wear
Dev wear
2019-03-21 10:52:14 +01:00
AdrianLxM 505b1a7928
Update README.md 2019-03-21 00:54:08 +01:00
Nico Schmitz 6dc87db73e Improve EditEventDialog 2019-03-21 00:38:06 +01:00
Nico Schmitz 87cf62e8f6 Refactoring. Fixes for screen rotation. 2019-03-20 23:09:46 +01:00
Nico Schmitz c074ec36c4 Implement temp target dialog for automation action 2019-03-20 00:39:00 +01:00
Milos Kozak 381ae67829
Merge pull request #1420 from tanja3981/improvement/#1269
[2.0] Improvement: Allow some objectives to go back.
2019-03-19 23:42:38 +01:00
Milos Kozak 8629203041
Merge pull request #1686 from MilosKozak/fix1660
Fix1660
2019-03-19 23:33:53 +01:00
Nico Schmitz 91e4b01f10 Display actions and merge recent upstream/dev
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
AdrianLxM d4d499587b Merge remote-tracking branch 'andyremote/wear_upgrade' into dev-wear 2019-03-18 23:51:20 +01:00
Milos Kozak db1a6bc71e wait for finished calculations instead of acting on new BG 2019-03-18 20:59:39 +01:00
Milos Kozak 18ba5878d2 Fix1660 2019-03-17 18:51:16 +01:00
Milos Kozak f9904d15d8
Merge pull request #1681 from tanja3981/improvement_pumpBatteryAge
Fixed: Use bage instead of pgage variable for coloring the battery age in careportal.
2019-03-14 16:40:17 +01:00
Milos Kozak 02f20b9e83
uncomment fileprovider 2019-03-14 11:18:02 +01:00
Milos Kozak 9629f6b458 Merge branch 'master' into dev 2019-03-14 11:15:29 +01:00
Milos Kozak 764d4bf635
Merge pull request #1684 from MilosKozak/AdrianLxM-patch-2
Don't abort on lint warnings
2019-03-14 11:13:15 +01:00
AdrianLxM 25b0115960
Don't abort on lint warnings 2019-03-14 10:50:10 +01:00
AdrianLxM 859267fe34
build with lint complaining 2019-03-14 10:47:29 +01:00
Andy Rozman b1baaf48f5 remove wear warning 2019-03-12 23:57:57 +00:00
Andy Rozman f7c4db35b5 Merge branch 'dev' into wear_upgrade 2019-03-12 22:46:38 +00:00
Andy Rozman be9039d8b0 Minor changes 2019-03-12 22:41:52 +00:00
Tanja Schmidt dc89d0dfcf Fixed: Use bage instead of pgage variable for coloring the battery age. 2019-03-12 21:30:23 +01:00
Milos Kozak f6d85bdd96 correct wakelock in iob calculation 2019-03-12 11:31:21 +01:00
Milos Kozak daaad02300
Merge pull request #1641 from andyrozman/ench_1455_custom_actions
Enhancement 1455 custom actions
2019-03-09 15:50:31 +01:00
Andy Rozman 8594525d2c Merge branch 'dev' into ench_1455_custom_actions 2019-03-08 23:49:56 +00:00
Milos Kozak 592d04af1d
Merge pull request #1669 from harispoljo/feature-TTRunLoop
[Enhancement] Run loop when TemporyTarget is changed
2019-03-08 23:16:09 +01:00
Milos Kozak cc3b50c12d
Merge pull request #1676 from TebbeUbben/dev
Insight: Enforce using first profile
2019-03-08 22:44:28 +01:00
Milos Kozak 0e95808c27 fix tests 2019-03-08 22:26:26 +01:00
Milos Kozak 967009b8d1
Merge pull request #1674 from PoweRGbg/patch-6
added test for getAvailableInternalMemorySize()
2019-03-08 22:01:26 +01:00
harispoljo 537c241e76
Made the intent easier to read. 2019-03-07 16:33:36 +01:00
Tebbe Ubben 9524818c4d Headline for Insight related settings 2019-03-07 15:25:29 +01:00
Tebbe Ubben 286be1e78f Insight: Enforce using first profile 2019-03-07 15:22:51 +01:00
Roumen Georgiev 065192f11e
added test for getAvailableInternalMemorySize()
it took me some time, but it's OK now
2019-03-07 14:49:07 +02:00
Milos Kozak f7c6f60131 Low storage notification 2019-03-07 11:32:09 +01:00
Milos Kozak e8a41b01b7 bump 2.1.3-dev 2019-03-07 11:07:48 +01:00
Milos Kozak c6916f0b74
Merge pull request #1673 from PoweRGbg/storageConstraint
storageConstraint
2019-03-07 11:05:56 +01:00
Roumen Georgiev 2b10e0f9e9 initial work 2019-03-07 11:32:29 +02:00
Milos Kozak 562ccf27cf
Merge pull request #1671 from tanja3981/issue1619
Issue1619: Fixed status notification for charging/uncharging
2019-03-07 07:43:45 +01:00
Andy Rozman a148f5d21d Fixed some files after merge. 2019-03-07 00:01:19 +00:00
Andy Rozman b91ab26863 Wear android manifest 2019-03-06 23:48:45 +00:00
Andy Rozman 6e500c1e75 On both sides changed BIND_LISTENER in manifest and added a lot of logging, some might be commented out.
On AAPS side:
- added some capabilites
- fully refactored SendToDataLayerThread (copied from xdrip)
- updated code
- all tasks are now executed on Executor (and not by itself) - main problem that some data was not sent

On Wear side:
- added capabilities and refactored code in ListenerService (by looking at xdrip code)
2019-03-06 23:38:18 +00:00
Tanja Schmidt c40907b951 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Tanja Schmidt a5d1905be8 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Tanja Schmidt 92cbe45341 Fixed status noticication for charging/uncharging: check battery not power state. 2019-03-06 19:00:11 +01:00
harisp 605601bcc6 Run loop when TemporyTarget is changed 2019-03-06 12:10:28 +01:00
Milos Kozak 1a73d60535 fix tests 2019-03-05 23:29:55 +01:00
Milos Kozak 02db9b681d fix MidnightTime crash + tests 2019-03-05 23:12:35 +01:00