AndroidAPS/app/src/main/res/layout
Johannes Mockenhaupt 3b43e4d06a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  RS enable BT before scanning
  BG viewer
  NSOffline remove from queue as well
  NS offline

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-12-20 20:21:12 +01:00
..
actions_fill_dialog.xml fill dialog refactor & code clean 2017-09-24 14:51:16 +02: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
bgsource_fragment.xml BG viewer 2017-12-15 01:03:31 +01:00
bgsource_item.xml BG viewer 2017-12-15 01:03:31 +01:00
careportal_fragment.xml disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
careportal_newnstreatment_dialog.xml reuse button on profile switch 2017-10-11 00:25:44 +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 rename button to activate profile 2017-10-04 23:33:02 +02:00
circadianpercentageprofile_listelement.xml CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
combo_alert_history_fragment.xml Rename fragment 'error history' -> 'alert history'. 2017-11-22 11:17:18 +01:00
combo_tdd_history_fragment.xml Fix TDDS dialog title. 2017-12-09 19:46:28 +01:00
combopump_fragment.xml ComboFragment: always show refresh button. 2017-12-09 22:08:38 +01:00
configbuilder_fragment.xml treatments in config builder 2017-10-07 01:18:28 +02:00
configbuilder_simpleitem.xml preferences update 2017-11-01 20:43:59 +01:00
danar_fragment.xml Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-05 00:32:47 +01: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 Revert string danar_stats. 2017-10-19 21:31:10 +02:00
danars_blescanner_activity.xml initial RS work 2017-09-13 00:35:03 +02:00
danars_blescanner_item.xml initial RS work 2017-09-13 00:35:03 +02:00
danars_pairingprogressdialog.xml initial RS work 2017-09-13 00:35:03 +02:00
food_fragment.xml food plugin 2017-10-17 20:55:23 +02:00
food_item.xml food plugin 2017-10-17 20:55:23 +02:00
insulin_fragment.xml Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
localprofile_fragment.xml Align LP GUI 2017-10-11 20:19:42 +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
nsprofile_fragment.xml NS profile fragment shows all profiles 2017-09-23 23:54:43 +02:00
number_picker_layout.xml allow decimal number in NumberPicker 2017-06-30 17:43:10 +02:00
objectives_fragment.xml Clean up string resources. 2017-11-22 11:27:49 +01: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 Minor tewaks and cleanups. 2017-12-13 21:37:44 +01: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_error_dialog.xml Minor tewaks and cleanups. 2017-12-13 21:37:44 +01:00
overview_fragment.xml refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
overview_fragment_nsclient.xml Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +02:00
overview_fragment_nsclient_tablet.xml Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +02:00
overview_fragment_smallheight.xml refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
overview_newextendedbolus_dialog.xml extended bolus dialog refactor 2017-09-24 13:00:59 +02:00
overview_newtempbasal_dialog.xml Strings reuse for pumps. 2017-10-19 16:11:36 +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
profileviewer_fragment.xml NS profile fragment shows all profiles 2017-09-23 23:54:43 +02:00
simpleprofile_fragment.xml rename button to activate profile 2017-10-04 23:33:02 +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 LocalProfile fix 2017-10-04 23:17:19 +02: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 CPP support to profile switch 2017-09-24 10:39:54 +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
virtualpump_fragment.xml Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-11-22 22:17:57 +01:00
wear_fragment.xml wear extract strings 2016-11-29 15:01:00 +01:00