summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix review commentsfeature/sdl_0116_open_menu_rpcBrettyWhite2019-08-013-13/+14
* another space fixBrettyWhite2019-07-311-2/+2
* spacing fixes from merge conflictsBrettyWhite2019-07-312-36/+36
* fix spacing in basescreenmanagerBrettyWhite2019-07-311-3/+2
* fix openSubMenu testsBrettyWhite2019-07-312-2/+1
* update travis line and fix proxy base bracketBrettyWhite2019-07-312-6/+7
* Merge branch 'develop' into feature/sdl_0116_open_menu_rpcBrett2019-07-3162-439/+2105
|\
| * Merge pull request #1111 from smartdevicelink/feature/issue_818Brett2019-07-299-77/+181
| |\
| | * Add templateTitle to TextFieldNameTestsfeature/issue_818Bilal Alsharifi2019-07-241-5/+9
| | * 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
| | * Add templateTitle unit testsBilal Alsharifi2019-07-154-6/+25
| | * 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-262-10/+37
| |\ \
| | * | Add getBytesAvailable() to FileManagerTestfeature/bytes_availableBilal Alsharifi2019-07-252-3/+6
| | * | Add getBytesAvailable() to FileManagerBilal Alsharifi2019-07-251-8/+32
| * | | Merge pull request #1131 from smartdevicelink/feature/softbutton_enhancementsBrett2019-07-256-23/+178
| |\ \ \ | | |/ / | |/| |
| | * | remove unused importBrettyWhite2019-07-251-1/+0
| | * | Fix formatting issuefeature/softbutton_enhancementsBilal Alsharifi2019-07-241-2/+2
| | * | Add unit tests for setting buttonId logicBilal Alsharifi2019-07-241-0/+53
| | * | Fix borken SoftButton testsBilal Alsharifi2019-07-243-13/+19
| | * | 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
| * | | Merge pull request #1130 from smartdevicelink/feature/lockscreen_defaultBilal Alsharifi2019-07-251-1/+3
| |\ \ \
| | * | | turn default oem icon setting to truefeature/lockscreen_defaultBrettyWhite2019-07-241-1/+3
| * | | | Merge pull request #1124 from smartdevicelink/feature/add_prerecorded_speech_scmBilal Alsharifi2019-07-245-1/+43
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix broken testfeature/add_prerecorded_speech_scmBrettyWhite2019-07-231-0/+4
| | * | | fix javadocBrettyWhite2019-07-231-1/+1
| | * | | add prerecorded speech to scmBrettyWhite2019-07-234-1/+39
| |/ / /
| * | | Merge pull request #1112 from smartdevicelink/feature/issue_795Brett2019-07-235-64/+116
| |\ \ \ | | |/ / | |/| |
| | * | Update base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.javaBrett2019-07-231-1/+1
| | * | Fix issue in code formattingfeature/issue_795Bilal Alsharifi2019-07-162-7/+6
| | * | Add alertIcon testsBilal Alsharifi2019-07-162-3/+17
| | * | Update ImageFieldNameTests to add alertIconBilal Alsharifi2019-07-161-0/+2
| | * | Add icon to Alert RPCBilal Alsharifi2019-07-162-62/+99
| | |/
| * | Merge pull request #1117 from smartdevicelink/feature/Implement_sdl_0231_main...Bilal Alsharifi2019-07-2319-81/+674
| |\ \
| | * | Update menu manager commentsBilal Alsharifi2019-07-231-0/+1
| | * | Set menuConfiguration before getting responsefeature/Implement_sdl_0231_main_menu_tilesBilal Alsharifi2019-07-221-5/+2
| | * | fixes per review commentsBrettyWhite2019-07-227-13/+15
View Lorry Controller Status