summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add Unit Tests for WindowCapabilityfeature/0268_MainMenuUpdating_PaginationRHenigan2020-08-142-0/+32
* Add DynamicUpdateCapabilitiesTestsRHenigan2020-08-141-0/+95
* Add new test files for new notificationsRHenigan2020-08-142-0/+151
* Merge branch 'develop' into feature/0268_MainMenuUpdating_PaginationRHenigan2020-08-1413-8/+838
|\
| * Merge pull request #1424 from smartdevicelink/feature/0242_subtle_alertRobert Henigan2020-08-1313-7/+836
| |\
| | * Update base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.javaBilal Alsharifi2020-08-131-1/+1
| | * Remove unused importsfeature/0242_subtle_alertBilal Alsharifi2020-08-121-2/+0
| | * Fix android x importsBilal Alsharifi2020-08-122-4/+4
| | * Update SubtleAlertResponse to the latest proposal revisionsBilal Alsharifi2020-08-121-5/+5
| | * Merge branch 'develop' into feature/0242_subtle_alertBilal Alsharifi2020-08-12537-6495/+4027
| | |\
| | * | Update MAX_SUPPORTED_RPC_VERSION to 7Bilal Alsharifi2020-07-301-1/+1
| | * | Add SubtleAlert testsBilal Alsharifi2020-07-303-0/+367
| | * | Fix SubtleAlert enums testsBilal Alsharifi2020-07-303-3/+7
| | * | Update header for SubtleAlertBilal Alsharifi2020-07-293-12/+12
| | * | Fix a typo in javadocBilal Alsharifi2020-07-292-14/+11
| | * | Update SubtleAlert javadocBilal Alsharifi2020-07-291-0/+8
| | * | Add SubtleAlert RPCBilal Alsharifi2020-07-298-14/+469
* | | | Fix androidx imports on new filesRHenigan2020-08-132-2/+2
* | | | Merge branch 'develop' into feature/0268_MainMenuUpdating_PaginationRHenigan2020-08-13616-3343/+4016
|\ \ \ \ | |/ / /
| * | | Merge pull request #1442 from smartdevicelink/feature/issue_1048_remove_symlinksRobert Henigan2020-08-12103-1352/+530
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'develop' into feature/issue_1048_remove_symlinksfeature/issue_1048_remove_symlinksBilal Alsharifi2020-08-113-4/+2
| | |\ \
| | * \ \ Merge branch 'develop' into feature/issue_1048_remove_symlinksBilal Alsharifi2020-08-11455-705/+708
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into feature/issue_1048_remove_symlinksBilal Alsharifi2020-08-1126-9/+793
| | |\ \ \ \
| | * | | | | Move java specific classes to javaSEBilal Alsharifi2020-08-116-0/+0
| | * | | | | Deprecate IProtocolListenerBilal Alsharifi2020-08-111-31/+32
| | * | | | | Merge branch 'develop' into feature/issue_1048_remove_symlinksBilal Alsharifi2020-08-114-24/+264
| | |\ \ \ \ \
| | * | | | | | remove baseAndroidBilal Alsharifi2020-08-1177-157/+0
| | * | | | | | Update Android build.gradle to link directly to base setBilal Alsharifi2020-08-111-14/+1
| | * | | | | | Move WebSocket classes to JavaSEBilal Alsharifi2020-08-112-0/+0
| | * | | | | | Move Android stub classes to JavaSEBilal Alsharifi2020-08-114-0/+0
| | * | | | | | Move cloud JSON classes to javaSEBilal Alsharifi2020-08-117-0/+0
| | * | | | | | Move cloud SdlTrace to javaSEBilal Alsharifi2020-08-111-0/+0
| | * | | | | | Handle files that exist in both base & androidBilal Alsharifi2020-08-117-1105/+452
| * | | | | | | Merge pull request #1437 from smartdevicelink/feature/issue_1425_gen_enum_capsJulian Kast2020-08-121-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix generated enum value names in RPC generatorfeature/issue_1425_gen_enum_capsBilal Alsharifi2020-08-071-1/+1
| * | | | | | | Merge pull request #1443 from smartdevicelink/AndroidX_FixesJulian Kast2020-08-113-4/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Import fixes for androidXAndroidX_FixesRHenigan2020-08-113-4/+2
| |/ / / / / /
| * | | | | | Merge pull request #1441 from smartdevicelink/AndroidXRobert Henigan2020-08-11455-705/+708
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | 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
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | 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
View Lorry Controller Status