summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix failing testsfeature/menu_tile_revisionBrettyWhite2019-08-191-2/+2
* removed more references to 'default'BrettyWhite2019-08-191-13/+11
* fix improper tabBrettyWhite2019-08-191-1/+1
* dont require Menu config params and remove defaultsBrettyWhite2019-08-194-25/+37
* Merge pull request #1149 from smartdevicelink/feature/deprecate_old_proxyBrett2019-08-197-101/+117
|\
| * add some javadocs for migrating to newer SDL VersionsBrettyWhite2019-08-192-32/+43
| * Deprecate old proxy classesfeature/deprecate_old_proxyBilal Alsharifi2019-08-127-69/+74
|/
* Merge pull request #1113 from smartdevicelink/feature/sdl_0116_open_menu_rpcBilal Alsharifi2019-08-0113-61/+623
|\
| * 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
| |\
| * | add version checksBrettyWhite2019-07-301-0/+15
| * | fix return statement positionBrettyWhite2019-07-291-1/+3
| * | fix open sub menuBrettyWhite2019-07-292-7/+8
| * | remove unused importsBrettyWhite2019-07-291-3/+0
| * | tests for openMenu APIsBrettyWhite2019-07-294-2/+120
| * | show app menu testsBrettyWhite2019-07-163-1/+240
| * | ShowAppMenu RPC - still needs testsBrettyWhite2019-07-167-31/+223
* | | Merge pull request #1088 from Tnnnguyen/lockscreenDismissBrett2019-07-314-32/+145
|\ \ \
| * \ \ Merge branch 'develop_mainRepo' into lockscreenDismissTuan Nguyen2019-07-31127-823/+8051
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'master' into developBilal Alsharifi2019-07-315-29/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge pull request #1139 from smartdevicelink/hotfix/fix_vr_optional4.9.1Joey Grover2019-07-315-29/+9
| |\ \ \
| | * | | Update travis fileBilal Alsharifi2019-07-311-0/+1
| | * | | Update changelog for 4.9.1hotfix/fix_vr_optionalBilal Alsharifi2019-07-301-22/+3
| | * | | Update VERSION_NAME to 4.9.1Bilal Alsharifi2019-07-302-2/+2
| | * | | Fix vr optional issueBilal Alsharifi2019-07-301-5/+3
| |/ / /
| * | | Merge pull request #1099 from smartdevicelink/developJoey Grover2019-06-271-1/+1
| |\ \ \
* | \ \ \ 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