Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into feature/issue_1048_remove_symlinksfeature/issue_1048_remove_symlinks | Bilal Alsharifi | 2020-08-11 | 3 | -4/+2 |
|\ | |||||
| * | Merge pull request #1443 from smartdevicelink/AndroidX_Fixes | Julian Kast | 2020-08-11 | 3 | -4/+2 |
| |\ | | | | | | | Import fixes for androidX | ||||
| | * | Import fixes for androidXAndroidX_Fixes | RHenigan | 2020-08-11 | 3 | -4/+2 |
| |/ | | | | | | | | | These imports were missed from another pr being merged shortly before the androidX pr | ||||
* | | Merge branch 'develop' into feature/issue_1048_remove_symlinks | Bilal Alsharifi | 2020-08-11 | 455 | -705/+708 |
|\ \ | |/ | |||||
| * | Merge pull request #1441 from smartdevicelink/AndroidX | Robert Henigan | 2020-08-11 | 455 | -705/+708 |
| |\ | | | | | | | Android x | ||||
| | * | Update JavaEE to use androidXAndroidX | Julian Kast | 2020-08-11 | 1 | -1/+1 |
| | | | |||||
| | * | Edit imports to use androidX, fixing merge conflicts | Julian Kast | 2020-08-11 | 2 | -2/+2 |
| | | | |||||
| | * | Fix sdlProxyBase Merge conflict | Julian Kast | 2020-08-11 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'develop' into AndroidX | Julian Kast | 2020-08-11 | 28 | -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 Imports | Julian Kast | 2020-08-11 | 14 | -16/+16 |
| | | | | |||||
| | * | | Update javaSE gradle file to use androidX | Julian Kast | 2020-08-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | convert hello_sdl to androidX | Julian Kast | 2020-08-11 | 2 | -4/+4 |
| | | | | |||||
| | * | | convert sdl_android gradle to androidX | Julian Kast | 2020-08-11 | 1 | -0/+2 |
| | | | | |||||
| | * | | convert sdl_android gradle to androidX | Julian Kast | 2020-08-11 | 1 | -5/+6 |
| | | | | |||||
| | * | | Convert lockScreen to android x | Julian Kast | 2020-08-11 | 1 | -8/+8 |
| | | | | |||||
| | * | | Update imports for androidX | Julian Kast | 2020-08-10 | 84 | -85/+85 |
| | | | | |||||
| | * | | Update imports to androidX | Julian Kast | 2020-08-10 | 115 | -115/+115 |
| | | | | |||||
| | * | | Update imports to androidX | Julian Kast | 2020-08-10 | 56 | -68/+68 |
| | | | | |||||
| | * | | Update Unit Test to androidx | Julian Kast | 2020-08-10 | 177 | -400/+400 |
| | | | | |||||
* | | | | Merge branch 'develop' into feature/issue_1048_remove_symlinks | Bilal Alsharifi | 2020-08-11 | 26 | -9/+793 |
|\ \ \ \ | |/ / / | |||||
| * | | | New vehicle data WindowStatus (#1396) | Kostiantyn Boskin | 2020-08-11 | 26 | -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> | ||||
* | | | | Move java specific classes to javaSE | Bilal Alsharifi | 2020-08-11 | 6 | -0/+0 |
| | | | | |||||
* | | | | Deprecate IProtocolListener | Bilal Alsharifi | 2020-08-11 | 1 | -31/+32 |
| | | | | |||||
* | | | | Merge branch 'develop' into feature/issue_1048_remove_symlinks | Bilal Alsharifi | 2020-08-11 | 4 | -24/+264 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #1436 from smartdevicelink/feature/integration_validator | Robert Henigan | 2020-08-11 | 4 | -24/+264 |
| |\ \ \ | | |_|/ | |/| | | Integration validator | ||||
| | * | | Add flag to skip RS check in validatorfeature/integration_validator | Joey Grover | 2020-08-10 | 3 | -19/+37 |
| | | | | | | | | | | | | | | | | Also reformatted code in validator | ||||
| | * | | Remove typo | Joey Grover | 2020-08-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add integration validation | Joey Grover | 2020-08-06 | 4 | -24/+246 |
| | | | | |||||
* | | | | remove baseAndroid | Bilal Alsharifi | 2020-08-11 | 77 | -157/+0 |
| | | | | |||||
* | | | | Update Android build.gradle to link directly to base set | Bilal Alsharifi | 2020-08-11 | 1 | -14/+1 |
| | | | | |||||
* | | | | Move WebSocket classes to JavaSE | Bilal Alsharifi | 2020-08-11 | 2 | -0/+0 |
| | | | | |||||
* | | | | Move Android stub classes to JavaSE | Bilal Alsharifi | 2020-08-11 | 4 | -0/+0 |
| | | | | |||||
* | | | | Move cloud JSON classes to javaSE | Bilal Alsharifi | 2020-08-11 | 7 | -0/+0 |
| | | | | |||||
* | | | | Move cloud SdlTrace to javaSE | Bilal Alsharifi | 2020-08-11 | 1 | -0/+0 |
| | | | | |||||
* | | | | Handle files that exist in both base & android | Bilal Alsharifi | 2020-08-11 | 7 | -1105/+452 |
|/ / / | |||||
* | | | Merge pull request #1430 from smartdevicelink/feature/refactor_interfaces | Julian Kast | 2020-08-11 | 20 | -815/+455 |
|\ \ \ | | | | | | | | | Refactor session and protocol interfaces | ||||
| * | | | Fix issues found during reviewfeature/refactor_interfaces | Joey Grover | 2020-08-10 | 8 | -20/+12 |
| | | | | |||||
| * | | | Run code formatter on session classes | Joey Grover | 2020-08-04 | 2 | -56/+56 |
| | | | | |||||
| * | | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵ | Joey Grover | 2020-08-04 | 21 | -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 tests | Joey Grover | 2020-08-04 | 3 | -124/+54 |
| | | | | |||||
| * | | | Implement interface refactor into JavaSE | Joey Grover | 2020-07-30 | 3 | -54/+31 |
| | | | | |||||
| * | | | Remove redundant caching of transport config | Joey Grover | 2020-07-30 | 1 | -3/+1 |
| | | | | |||||
| * | | | update symlink to new file name | Joey Grover | 2020-07-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Rename actual interface file | Joey Grover | 2020-07-30 | 1 | -80/+80 |
| | | | | |||||
| * | | | Merge branch 'feature/sdlsession_refactor' of ↵ | Joey Grover | 2020-07-30 | 1 | -0/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into feature/refactor_interfaces | ||||
| * \ \ \ | Merge branch 'feature/sdlsession_refactor' of ↵ | Joey Grover | 2020-07-30 | 7 | -27/+66 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into feature/refactor_interfaces | ||||
| * | | | | | Update android used classes for refactored intrfcs | Joey Grover | 2020-07-29 | 13 | -665/+323 |
| | | | | | | |||||
| * | | | | | Refactor interfaces for protocol and session | Joey Grover | 2020-07-29 | 3 | -5/+90 |
| | | | | | | |||||
* | | | | | | Merge pull request #1403 from LuxoftSDL/Feature/webengine_projection_mode | Robert Henigan | 2020-08-10 | 8 | -95/+138 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Feature/webengine projection mode | ||||
| * | | | | | Bump up MAX_SUPPORTED_RPC_VERSION to 7.0.0 | Vladyslav Mustafin | 2020-08-07 | 1 | -1/+1 |
| | | | | | |