Johannes Mockenhaupt
|
0e61032dec
|
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
wear update
RS create bond
add scrollview
QuickWizard detailed settings
# Conflicts:
# app/src/main/res/values/strings.xml
|
2017-12-27 18:19:51 +01:00 |
|
AdrianLxM
|
9387665df9
|
wear update
|
2017-12-27 14:57:54 +01:00 |
|
Johannes Mockenhaupt
|
bf9f877b3d
|
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev: (68 commits)
max connection time to 120 sec
make chart zoomable again
fix NPE
lowest priority for background calculations
wear timestamps long
remove unneeded code
fix landscape overview
synchronized wait
fix build tools for travis
try to fix travis
upgrade build tools
R: resolve thread deadlock during bolus stop
remove unsupported code from korean pump
handle bolus stop prior to delivery correctly
fix translations
better logging
Revert unnecessary change.
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
gradle update
parse more iso formats
...
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/info/nightscout/androidaps/Config.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
# 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/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
# app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
# app/src/main/res/values/strings.xml
# app/src/main/res/xml/pref_others.xml
# app/src/main/res/xml/pref_wear.xml
# gradle/wrapper/gradle-wrapper.properties
# wear/build.gradle
|
2017-12-05 00:32:47 +01:00 |
|
Milos Kozak
|
5a12d15c8c
|
upgrade build tools
|
2017-12-03 21:15:12 +01:00 |
|
Johannes Mockenhaupt
|
394a42837a
|
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
|
2017-10-28 13:43:25 +02:00 |
|
Johannes Mockenhaupt
|
7b3f474b58
|
Upgrade to Android Studio 3.0.
|
2017-10-25 22:49:50 +02:00 |
|
AdrianLxM
|
f751638a7f
|
enabling wearcontrols from preferences
|
2017-10-12 18:01:10 +02:00 |
|
AdrianLxM
|
7bc0a18f6e
|
Version-Number in settings
|
2017-08-08 02:06:46 +02:00 |
|
AdrianLxM
|
f0521c0197
|
nighttime watchface
|
2017-06-30 01:49:32 +02:00 |
|
Milos Kozak
|
c18fcfda62
|
revert sdk to 23
|
2017-04-22 10:18:31 +02:00 |
|
Milos Kozak
|
0a2105ac50
|
wear target 25
|
2017-04-21 12:27:16 +02:00 |
|
AdrianLxM
|
e85e651c56
|
wear full status support and product flavour with/without controls on wear
|
2017-02-13 01:55:35 +01:00 |
|
Milos Kozak
|
d6f4135d6e
|
travis
|
2016-12-28 15:58:44 +01:00 |
|
AdrianLxM
|
70338ac158
|
wear PoweRGbg fixes
|
2016-11-28 18:42:19 +01:00 |
|
AdrianLxM
|
3adb6b2c15
|
Merge branch 'watchface-colors' of https://github.com/LadyViktoria/AndroidAPS into wear-working1
|
2016-11-26 07:10:48 +01:00 |
|
AdrianLxM
|
a69c1150ea
|
tap tests
|
2016-11-26 07:09:57 +01:00 |
|
AdrianLxM
|
70c3969f85
|
wear something is painting
|
2016-11-24 16:23:31 +01:00 |
|
AdrianLxM
|
2fd93a8e31
|
wear installing on watch
|
2016-11-24 16:23:31 +01:00 |
|