caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
AndroidAPS/app/src/main/res/layout
History
Johannes Mockenhaupt 1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (53 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/res/values/strings.xml
2017-09-18 22:54:35 +02:00
..
actions_fill_dialog.xml fill preset buttons 2016-11-11 16:24:00 +01:00
actions_fragment.xml move cancel temp to actions 2017-08-01 20:45:57 +02:00
activity_agreement.xml Agreement 2016-07-07 18:04:36 +02:00
activity_main.xml menu on top 2017-05-04 19:13:56 +02:00
app_bar.xml Objectives design 2016-06-04 17:28:05 +02:00
careportal_fragment.xml disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
careportal_newnstreatment_dialog.xml careportal dialog number picker 2017-06-29 01:37:58 +02:00
careportal_stats_fragment.xml Picture renaming (#311) 2017-07-21 22:24:06 +02:00
careportal_stats_fragment_short.xml nsclient layout for phones 2017-07-02 11:28:03 +02:00
circadianpercentageprofile_editbasal_dialog.xml CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
circadianpercentageprofile_fragment.xml upgrade travis & plugin packages 2017-04-21 12:15:08 +02:00
circadianpercentageprofile_listelement.xml CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
combopump_fragment.xml Remove code to determine pump capabilities for the time being. 2017-08-27 18:45:22 +02:00
configbuilder_fragment.xml visibility icon 2017-08-29 21:40:06 +02:00
configbuilder_simpleitem.xml single line in configbuilder 2017-08-29 19:47:32 +02:00
danar_fragment.xml basal and bolus step in DanaR Fragment 2017-05-16 13:10:02 +02:00
danar_history_item.xml Update danar_history_item.xml 2016-11-08 06:08:12 +01:00
danar_historyactivity.xml simplify danar activities, fix profiles 2017-06-12 23:31:50 +02:00
danar_statsactivity.xml simplify danar activities, fix profiles 2017-06-12 23:31:50 +02:00
insulin_fragment.xml Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
localprofile_fragment.xml upgrade travis & plugin packages 2017-04-21 12:15:08 +02:00
loop_fragment.xml Align OpenAS(A)MA fragments with layout of other fragments. 2017-07-19 12:32:18 +02:00
nsclientinternal_fragment.xml nsclient gui and pausing tweaking 2017-02-17 18:14:33 +01:00
nsprofileviewer_fragment.xml Show profile on tap in Treatments->ProfileSwitch 2017-08-17 17:03:08 +02:00
number_picker_layout.xml allow decimal number in NumberPicker 2017-06-30 17:43:10 +02:00
objectives_fragment.xml upgrade travis & plugin packages 2017-04-21 12:15:08 +02:00
objectives_item.xml objectives fragment complete 2016-06-27 18:48:48 +02:00
openapsama_fragment.xml Align OpenAS(A)MA fragments with layout of other fragments. 2017-07-19 12:32:18 +02:00
openapsma_fragment.xml Align OpenAS(A)MA fragments with layout of other fragments. 2017-07-19 12:32:18 +02:00
overview_bolusprogress_dialog.xml fix BolusProgessDialog size on Android 6 2016-10-11 23:49:26 +02:00
overview_calibration_dialog.xml Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
overview_editquickwizard_dialog.xml remove TODOs 2017-02-09 20:18:22 +01:00
overview_fragment.xml AcceptTempButton visible 2017-08-16 23:22:14 +02:00
overview_fragment_nsclient.xml allow lock screen in nsclient mode 2017-07-03 00:02:54 +02:00
overview_fragment_nsclient_tablet.xml remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00
overview_fragment_smallheight.xml remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00
overview_newextendedbolus_dialog.xml Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
overview_newtempbasal_dialog.xml Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
overview_newtreatment_dialog.xml bolus dialog numberpickers 2017-06-27 19:14:32 +02:00
overview_notification_item.xml dismiss button not hardcoded 2016-12-24 23:56:47 +01:00
overview_quickwizardlist_activity.xml QuickWizard 2016-10-20 23:50:31 +02:00
overview_quickwizardlist_item.xml overview buttons 2017-05-12 11:06:33 +02:00
overview_wizard_dialog.xml WizardDialog: don't persist state of tt checkbox, default to false. 2017-09-09 16:37:08 +02:00
passwordprompt.xml settings password protected 2017-02-14 19:16:34 +01:00
simpleprofile_fragment.xml upgrade travis & plugin packages 2017-04-21 12:15:08 +02:00
smscommunicator_fragment.xml sms communicator: remote bolus, status 2016-07-14 23:29:21 +02:00
spinner_centered.xml superbolus must be explicitly enabled 2017-04-22 11:08:57 +02:00
timelistedit_element.xml Local Profile 2016-12-31 20:10:36 +01:00
treatments_bolus_fragment.xml return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
treatments_bolus_item.xml isValid implementation 2017-08-17 20:51:24 +02:00
treatments_extendedbolus_fragment.xml return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
treatments_extendedbolus_item.xml tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
treatments_fragment.xml allow decimal number in NumberPicker 2017-06-30 17:43:10 +02:00
treatments_profileswitch_fragment.xml fix bugs & design tweaking 2017-06-02 23:25:11 +02:00
treatments_profileswitch_item.xml tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
treatments_tempbasals_fragment.xml return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
treatments_tempbasals_item.xml tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
treatments_temptarget_fragment.xml fix bugs & design tweaking 2017-06-02 23:25:11 +02:00
treatments_temptarget_item.xml tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
vitualpump_fragment.xml virtual pump layout 2017-04-29 17:48:45 +02:00
wear_fragment.xml wear extract strings 2016-11-29 15:01:00 +01:00