summaryrefslogtreecommitdiff
path: root/base
Commit message (Expand)AuthorAgeFilesLines
* change back to previous wayfeature/Implement_SDL0054_Change_Registration_ManagerBrettyWhite2019-08-161-75/+1
* revert last commitBrettyWhite2019-08-161-0/+76
* Merge pull request #1145 from smartdevicelink/feature/Implement_SDL0054_Chang...Brett2019-08-081-0/+1
|\
| * Close transportmanager when ending session in protJoey Grover2019-08-071-0/+1
* | Merge branch 'develop' into feature/Implement_SDL0054_Change_Registration_Man...BrettyWhite2019-08-076-56/+316
|\ \ | |/ |/|
| * Merge pull request #1113 from smartdevicelink/feature/sdl_0116_open_menu_rpcBilal Alsharifi2019-08-016-56/+316
| |\
| | * fix review commentsfeature/sdl_0116_open_menu_rpcBrettyWhite2019-08-012-12/+13
| | * fix spacing in basescreenmanagerBrettyWhite2019-07-311-3/+2
| | * fix openSubMenu testsBrettyWhite2019-07-311-2/+0
| | * Merge branch 'develop' into feature/sdl_0116_open_menu_rpcBrett2019-07-3130-373/+1352
| | |\
| | * | add version checksBrettyWhite2019-07-301-0/+15
| | * | fix return statement positionBrettyWhite2019-07-291-1/+3
| | * | fix open sub menuBrettyWhite2019-07-291-5/+6
| | * | tests for openMenu APIsBrettyWhite2019-07-293-2/+92
| | * | ShowAppMenu RPC - still needs testsBrettyWhite2019-07-164-31/+188
* | | | sdl service exampleBrettyWhite2019-08-021-2/+2
* | | | adding in some logicBrettyWhite2019-08-022-8/+9
* | | | start of crmBrettyWhite2019-08-011-0/+125
|/ / /
* | | Merge branch 'develop_mainRepo' into lockscreenDismissTuan Nguyen2019-07-3154-403/+4455
|\ \ \
| * \ \ Merge branch 'master' into developBilal Alsharifi2019-07-311-5/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Fix vr optional issueBilal Alsharifi2019-07-301-5/+3
| * | | Merge pull request #1111 from smartdevicelink/feature/issue_818Brett2019-07-294-66/+147
| |\ \ \
| | * | | Add templateTitle to TextFieldName enumBilal Alsharifi2019-07-241-33/+39
| | * | | Fix issue with text formattingBilal Alsharifi2019-07-161-1/+1
| | * | | Update javadoc for setTemplateTitleBilal Alsharifi2019-07-161-0/+1
| | * | | Fix issue in setting templateTitle in ScreenManagerBilal Alsharifi2019-07-151-1/+6
| | * | | Update templateTitle javadocBilal Alsharifi2019-07-152-9/+2
| | * | | Update screenManager to support templateTitleBilal Alsharifi2019-07-152-1/+42
| | * | | Update templateTitle setter/getterBilal Alsharifi2019-07-151-2/+2
| | * | | Fix typo on javadocBilal Alsharifi2019-07-151-1/+1
| | * | | Add templateTitle param to Show RPCBilal Alsharifi2019-07-151-31/+66
| | | |/ | | |/|
| * | | Merge pull request #1134 from smartdevicelink/feature/bytes_availableBrett2019-07-261-8/+32
| |\ \ \
| | * | | Add getBytesAvailable() to FileManagerTestfeature/bytes_availableBilal Alsharifi2019-07-251-1/+1
| | * | | Add getBytesAvailable() to FileManagerBilal Alsharifi2019-07-251-8/+32
| * | | | Merge pull request #1131 from smartdevicelink/feature/softbutton_enhancementsBrett2019-07-253-10/+106
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | remove unused importBrettyWhite2019-07-251-1/+0
| | * | | Calc maxButtonIdsSetByDev manuallyBilal Alsharifi2019-07-241-2/+5
| | * | | Extract ids setting logic into a spearate methodBilal Alsharifi2019-07-241-26/+44
| | * | | Update setButtonId() javadocBilal Alsharifi2019-07-241-1/+2
| | * | | Remove additional semicolon BaseSoftButtonManagerBilal Alsharifi2019-07-241-1/+1
| | * | | Roll softbutton ids over to 0 when max is reachedBilal Alsharifi2019-07-242-5/+13
| | * | | Improve setting softbutton ids logicBilal Alsharifi2019-07-233-6/+37
| | * | | Add isHighlighted & systemAction to SoftButtonStateBilal Alsharifi2019-07-232-2/+38
| * | | | fix javadocBrettyWhite2019-07-231-1/+1
| * | | | add prerecorded speech to scmBrettyWhite2019-07-232-1/+24
| * | | | Merge pull request #1112 from smartdevicelink/feature/issue_795Brett2019-07-232-62/+98
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.javaBrett2019-07-231-1/+1
| | * | | Fix issue in code formattingfeature/issue_795Bilal Alsharifi2019-07-161-1/+0
| | * | | Add icon to Alert RPCBilal Alsharifi2019-07-162-62/+99
| | |/ /
| * | | Merge pull request #1117 from smartdevicelink/feature/Implement_sdl_0231_main...Bilal Alsharifi2019-07-238-69/+425
| |\ \ \