summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make ChoiceSetManager operations blocking (#1155)feature/cancel_interaction_RPCBilal Alsharifi2019-09-1210-140/+348
* Removed unused codeNicoleYarroch2019-08-211-5/+0
* Refactored Thread.currentThread().isInterrupted()NicoleYarroch2019-08-213-9/+19
* Removed uneeded deprecated presentKeyboard()NicoleYarroch2019-08-213-15/+4
* dismissKeyboard() now takes a nonnull IntegerNicoleYarroch2019-08-212-2/+2
* Merge branch 'feature/issue_840_cancel_interaction_RPC' of https://github.com...NicoleYarroch2019-08-212-4/+4
|\
| * Update base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseC...NicoleYarroch2019-08-211-1/+1
| * Update base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseC...NicoleYarroch2019-08-211-1/+1
| * Update base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseC...NicoleYarroch2019-08-211-1/+1
| * Update base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.javaNicoleYarroch2019-08-211-1/+1
* | Attempting to fix spacing issue in testsNicoleYarroch2019-08-212-2/+2
* | Fixed documentationNicoleYarroch2019-08-211-1/+1
|/
* Added constructor to Cancel Interaction ResponseNicoleYarroch2019-08-211-0/+14
* Refactored true/false checks in test casesNicoleYarroch2019-08-143-52/+23
* `presentKeyboard` no longer deprecatedNicoleYarroch2019-08-141-12/+1
* Added nullable to `presentKeyboard()` return valueNicoleYarroch2019-08-143-3/+3
* Fixed spacingNicoleYarroch2019-08-141-0/+1
* Removed unused importsNicoleYarroch2019-08-141-4/+0
* Added check for canceled threads.NicoleYarroch2019-08-146-34/+109
* Keyboard now cancels with `cancelID`NicoleYarroch2019-08-136-69/+160
* Refactored cancelID, added spec version checkNicoleYarroch2019-08-126-17/+60
* Refactored the dismiss keyboard methodsNicoleYarroch2019-08-122-17/+28
* Test cases added for dismissing keyboard w managerNicoleYarroch2019-08-122-3/+21
* Added cancel id documentation to modal viewsNicoleYarroch2019-08-084-4/+11
* Added cancel interaction to SdlProxyBaseNicoleYarroch2019-08-081-0/+16
* Fix for SdlProxyBaseNicoleYarroch2019-08-081-8354/+8354
* Fixing SdlProxyBase merge conflictNicoleYarroch2019-08-081-1553/+1537
* Renamed cancel keyboard methodNicoleYarroch2019-08-074-9/+7
* Removed unused imports from testNicoleYarroch2019-08-073-3/+1
* Merge branch 'develop' into feature/issue_840_cancel_interaction_RPCNicoleYarroch2019-08-0729-8550/+9308
|\
| * 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