Jens 5af59e1754 Merge remote-tracking branch 'origin/development-stable' into development ...

# Conflicts:
#	app/src/main/java/com/jens/automation2/Trigger.java

2022-02-22 22:21:39 +01:00

..

actions/wifi_router

…

location

ringtone

2022-02-02 18:06:37 +01:00

receivers

logging

2022-02-12 20:04:19 +01:00

Action.java

new triggers: service or device starts

2022-02-06 20:12:11 +01:00

Actions.java

control media playback

2022-01-27 11:34:04 +01:00

ActivityControlCenter.java

control media playback

2022-01-27 11:34:04 +01:00

ActivityDisplayLongMessage.java

…

ActivityGeneric.java

…

ActivityHelp.java

Rework

2021-12-20 19:58:43 +01:00

ActivityMainPoi.java

…

ActivityMainProfiles.java

profile trigger

2022-01-05 18:06:26 +01:00

ActivityMainRules.java

logging

2022-02-20 18:57:13 +01:00

ActivityMainScreen.java

wrong field changed

2022-02-22 17:55:43 +01:00

ActivityMainTabLayout.java

Translations and integrated BT tethering

2021-11-26 19:26:42 +01:00

ActivityManageActionBrightnessSetting.java

screen status trigger

2022-01-20 17:57:13 +01:00

ActivityManageActionCloseNotification.java

close notification action

2022-01-15 01:41:00 +01:00

ActivityManageActionControlMedia.java

control media playback

2022-01-27 11:34:04 +01:00

ActivityManageActionCreateNotification.java

notification trigger

2022-01-09 15:22:03 +01:00

ActivityManageActionPlaySound.java

…

ActivityManageActionSendTextMessage.java

ringtone

2022-02-03 13:41:05 +01:00

ActivityManageActionSpeakText.java

Rework

2021-12-11 02:04:45 +01:00

ActivityManageActionStartActivity.java

ringtone

2022-02-03 13:41:05 +01:00

ActivityManageActionTriggerUrl.java

…

ActivityManageActionVibrate.java

…

ActivityManagePoi.java

ringtone

2022-02-02 18:06:37 +01:00

ActivityManageProfile.java

ringtone

2022-02-03 13:41:05 +01:00

ActivityManageRule.java

new triggers: service or device starts

2022-02-06 20:12:11 +01:00

ActivityManageTriggerBluetooth.java

…

ActivityManageTriggerDeviceOrientation.java

profile trigger

2022-01-05 18:06:26 +01:00

ActivityManageTriggerNfc.java

…

ActivityManageTriggerNotification.java

close notification action

2022-01-15 01:41:00 +01:00

ActivityManageTriggerPhoneCall.java

…

ActivityManageTriggerProfile.java

Notification action

2022-01-10 19:57:55 +01:00

ActivityManageTriggerTimeFrame.java

reoccuring time

2021-11-07 17:29:00 +01:00

ActivityManageTriggerWifi.java

code cleanups

2022-01-09 21:43:49 +01:00

ActivityPermissions.java

ringtone

2022-02-03 13:41:05 +01:00

ActivitySettings.java

…

ActivityVolumeTest.java

Rework

2021-12-19 17:12:24 +01:00

AESCrypt.java

…

AsyncTasks.java

…

AutomationService.java

new triggers: service or device starts

2022-02-06 20:12:11 +01:00

CompensateCrappyAndroidPaths.java

…

DeviceAdmin.java

Rework

2021-12-19 14:47:46 +01:00

FileShareProvider.java

…

Miscellaneous.java

ringtone

2022-02-02 18:06:37 +01:00

MyHttpClient.java

…

MySSLSocketFactoryInsecure.java

…

News.java

Rework

2021-12-20 19:58:43 +01:00

PointOfInterest.java

Rework

2021-12-13 20:03:00 +01:00

Profile.java

show profile on main screen

2022-02-03 14:05:42 +01:00

ReceiverCoordinator.java

new triggers: service or device starts

2022-02-06 20:12:11 +01:00

Settings.java

new triggers: service or device starts

2022-02-06 20:12:11 +01:00

TimeFrame.java

Reoccuring time trigger

2021-11-13 02:32:39 +01:00

Trigger.java

Android 11

2022-02-22 22:15:27 +01:00

XmlFileInterface.java

control media playback

2022-01-27 11:34:04 +01:00