summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Import fixes for androidXAndroidX_FixesRHenigan2020-08-113-4/+2
| | | | | These imports were missed from another pr being merged shortly before the androidX pr
* Merge pull request #1441 from smartdevicelink/AndroidXRobert Henigan2020-08-11455-705/+708
|\ | | | | Android x
| * Update JavaEE to use androidXAndroidXJulian Kast2020-08-111-1/+1
| |
| * Edit imports to use androidX, fixing merge conflictsJulian Kast2020-08-112-2/+2
| |
| * Fix sdlProxyBase Merge conflictJulian Kast2020-08-111-1/+1
| |
| * Merge branch 'develop' into AndroidXJulian Kast2020-08-1128-911/+594
| |\ | | | | | | | | | | | | | | | # Conflicts: # android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java # javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
| * | Update javaSE ImportsJulian Kast2020-08-1114-16/+16
| | |
| * | Update javaSE gradle file to use androidXJulian Kast2020-08-111-1/+1
| | |
| * | convert hello_sdl to androidXJulian Kast2020-08-112-4/+4
| | |
| * | convert sdl_android gradle to androidXJulian Kast2020-08-111-0/+2
| | |
| * | convert sdl_android gradle to androidXJulian Kast2020-08-111-5/+6
| | |
| * | Convert lockScreen to android xJulian Kast2020-08-111-8/+8
| | |
| * | Update imports for androidXJulian Kast2020-08-1084-85/+85
| | |
| * | Update imports to androidXJulian Kast2020-08-10115-115/+115
| | |
| * | Update imports to androidXJulian Kast2020-08-1056-68/+68
| | |
| * | Update Unit Test to androidxJulian Kast2020-08-10177-400/+400
| | |
* | | New vehicle data WindowStatus (#1396)Kostiantyn Boskin2020-08-1126-9/+793
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [0261] - Implement WindowState/WindowStatus structs - Implement changes in proper requests responses related to new structs * [0261] - Fix tests - Add new tests for WindowStatus/WindowState - Fix updated Structs according to specification * [0256] - Update tests data after code review - Add WindowStatus in Test.java - Remove @NonNull from OnVehicleData - Rename setVehicleDataResult --> setWindowStatus * [0261] - Extend testJsonConstructor with new tests * [0261] - Update tests after code review * [0261] - ValidateWindowStatuses --> ValidateWindowStatus * [0261] - Test --> TestValues * [0261] - 6.0.0 --> 7.0.0 * [0261] - Regenerate using Generator - Fix tests * [0261] - Rollback of formatting changes * [0261] - Fix compilation errors on merge * [0261] - Update javadoc * Revert LF to CRLF line separators Co-authored-by: kboskin <kboskin> Co-authored-by: Vladyslav Mustafin <vmustafin@luxoft.com>
* | | Merge pull request #1436 from smartdevicelink/feature/integration_validatorRobert Henigan2020-08-114-24/+264
|\ \ \ | |_|/ |/| | Integration validator
| * | Add flag to skip RS check in validatorfeature/integration_validatorJoey Grover2020-08-103-19/+37
| | | | | | | | | | | | Also reformatted code in validator
| * | Remove typoJoey Grover2020-08-061-1/+1
| | |
| * | Add integration validationJoey Grover2020-08-064-24/+246
| | |
* | | Merge pull request #1430 from smartdevicelink/feature/refactor_interfacesJulian Kast2020-08-1120-815/+455
|\ \ \ | | | | | | | | Refactor session and protocol interfaces
| * | | Fix issues found during reviewfeature/refactor_interfacesJoey Grover2020-08-108-20/+12
| | | |
| * | | Run code formatter on session classesJoey Grover2020-08-042-56/+56
| | | |
| * | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵Joey Grover2020-08-0421-133/+122
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into feature/refactor_interfaces # Conflicts: # android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java # android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java # android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java # javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
| * | | Fix unit testsJoey Grover2020-08-043-124/+54
| | | |
| * | | Implement interface refactor into JavaSEJoey Grover2020-07-303-54/+31
| | | |
| * | | Remove redundant caching of transport configJoey Grover2020-07-301-3/+1
| | | |
| * | | update symlink to new file nameJoey Grover2020-07-301-1/+1
| | | |
| * | | Rename actual interface fileJoey Grover2020-07-301-80/+80
| | | |
| * | | Merge branch 'feature/sdlsession_refactor' of ↵Joey Grover2020-07-301-0/+7
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into feature/refactor_interfaces
| * \ \ \ Merge branch 'feature/sdlsession_refactor' of ↵Joey Grover2020-07-307-27/+66
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into feature/refactor_interfaces
| * | | | | Update android used classes for refactored intrfcsJoey Grover2020-07-2913-665/+323
| | | | | |
| * | | | | Refactor interfaces for protocol and sessionJoey Grover2020-07-293-5/+90
| | | | | |
* | | | | | Merge pull request #1403 from LuxoftSDL/Feature/webengine_projection_modeRobert Henigan2020-08-108-95/+138
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Feature/webengine projection mode
| * | | | | Bump up MAX_SUPPORTED_RPC_VERSION to 7.0.0Vladyslav Mustafin2020-08-071-1/+1
| | | | | |
| * | | | | Update base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.javaVladyslav Mustafin2020-08-061-0/+2
| | | | | | | | | | | | | | | | | | Co-authored-by: Robert Henigan <heniganr1@gmail.com>
| * | | | | [WebEngine]kboskin2020-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | - webView --> enumWebView in tests
| * | | | | [WebEngine]kboskin2020-07-205-33/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add WEB_VIEW to AppHMIType && PredefinedLayout - Add corresponding tests
| * | | | | [0273]kboskin2020-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Change Test --> TestValues
| * | | | | Merge branch 'develop' into Feature/webengine_projection_modekboskin2020-07-03478-13819/+16616
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
| * | | | | | [0273]kboskin2020-06-304-62/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update RAI with RESOURCE_CONSTRAINT - Fix tests
* | | | | | | Merge pull request #1395 from ↵Bilal Alsharifi2020-08-0619-210/+448
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kostyaBoss/fork/0257_new_vehicle_data_hands_off_steering [0257] New vehicle data HandsOffSteering
| * | | | | | | Rollback line endsVladyslav Mustafin2020-08-063-1956/+1956
| | | | | | | |
| * | | | | | | Rollback javadocVladyslav Mustafin2020-08-064-670/+734
| | | | | | | |
| * | | | | | | Rollback other formattingVladyslav Mustafin2020-08-065-2192/+2259
| | | | | | | |
| * | | | | | | Full revert of GetVehicleData.javaVladyslav Mustafin2020-08-061-77/+49
| | | | | | | |
| * | | | | | | Update VehicleDataType.javaKostiantyn Boskin2020-08-061-40/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [0257] Rollback VehicleDataType
| * | | | | | | Rollback GetVehicleData.java formattingVladyslav Mustafin2020-08-061-588/+588
| | | | | | | |
| * | | | | | | Rollback GetVehicleData.java formattingVladyslav Mustafin2020-08-061-226/+221
| | | | | | | |
View Lorry Controller Status