Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add in non-null to settersfeature/mandatory_params | BrettyWhite | 2019-09-16 | 5 | -7/+7 |
| | |||||
* | tests and docs | BrettyWhite | 2019-09-16 | 9 | -0/+44 |
| | |||||
* | add in missing helper constructors | BrettyWhite | 2019-09-16 | 5 | -1/+32 |
| | |||||
* | Merge pull request #1161 from smartdevicelink/bugfix/resume_secondary_transport | Bilal Alsharifi | 2019-09-13 | 3 | -10/+57 |
|\ | | | | | Allow Video Service to restart after secondary transport disconnection | ||||
| * | Merge branch 'develop' into bugfix/resume_secondary_transportbugfix/resume_secondary_transport | Bilal Alsharifi | 2019-09-12 | 1 | -6/+5 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1165 from ↵ | Bilal Alsharifi | 2019-09-12 | 1 | -6/+5 |
|\ \ | | | | | | | | | | | | | smartdevicelink/bugfix/video_stream_isStreaming_fix VSM isStreaming logic fix | ||||
| * | | fix is paused logic | BrettyWhite | 2019-09-12 | 1 | -6/+5 |
| | | | |||||
| * | | fix incorrect method logicbugfix/video_stream_isStreaming_fix | BrettyWhite | 2019-09-05 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'develop' into bugfix/resume_secondary_transport | Bilal Alsharifi | 2019-09-12 | 87 | -377/+3583 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #1169 from smartdevicelink/display_layout_fix | Bilal Alsharifi | 2019-09-12 | 4 | -68/+66 |
|\ \ \ | | | | | | | | | Remove Deprecation from SetDisplayLayout | ||||
| * | | | remove deprecation and add javadocdisplay_layout_fix | BrettyWhite | 2019-09-10 | 4 | -68/+66 |
| | | | | |||||
* | | | | Merge pull request #1156 from smartdevicelink/feature/cancel_interaction_RPC | Bilal Alsharifi | 2019-09-12 | 35 | -224/+1781 |
|\ \ \ \ | |/ / / |/| | | | Implement SDL-0184 CancelInteraction RPC | ||||
| * | | | Make ChoiceSetManager operations blocking (#1155)feature/cancel_interaction_RPC | Bilal Alsharifi | 2019-09-12 | 10 | -140/+348 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add blocking operations support * Update AsynchronousOperation.ToString() * Handle some missing onError logic in operations * Update cancel() and isCancelled() to use the current thread * Avoid interrupting thread when canceling operations * Clean up BaseChoiceSetManager * fix NPE from pendingSet * fix failing tests in ChoiceSetManagerTests * Comment out cancel interaction tests temporarily * Avoid using thread interruptions in AsynchronousOperation * Update AsynchronousOperation.toString() * Fixed print statement crashing if no operating thread * Fixed present choice set cancel operation tests * Fixed spacing issues * Added additional assert + fixed doc grammar * Fixed cancel keyboard operation tests * Modified termination duration in test cases | ||||
| * | | | Removed unused code | NicoleYarroch | 2019-08-21 | 1 | -5/+0 |
| | | | | |||||
| * | | | Refactored Thread.currentThread().isInterrupted() | NicoleYarroch | 2019-08-21 | 3 | -9/+19 |
| | | | | |||||
| * | | | Removed uneeded deprecated presentKeyboard() | NicoleYarroch | 2019-08-21 | 3 | -15/+4 |
| | | | | |||||
| * | | | dismissKeyboard() now takes a nonnull Integer | NicoleYarroch | 2019-08-21 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'feature/issue_840_cancel_interaction_RPC' of ↵ | NicoleYarroch | 2019-08-21 | 2 | -4/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | https://github.com/NicoleYarroch/sdl_android into feature/issue_840_cancel_interaction_RPC | ||||
| | * | | | Update ↵ | NicoleYarroch | 2019-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java Co-Authored-By: Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | ||||
| | * | | | Update ↵ | NicoleYarroch | 2019-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java Co-Authored-By: Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | ||||
| | * | | | Update ↵ | NicoleYarroch | 2019-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java Co-Authored-By: Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | ||||
| | * | | | Update base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java | NicoleYarroch | 2019-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Co-Authored-By: Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | ||||
| * | | | | Attempting to fix spacing issue in tests | NicoleYarroch | 2019-08-21 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed documentation | NicoleYarroch | 2019-08-21 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Added constructor to Cancel Interaction Response | NicoleYarroch | 2019-08-21 | 1 | -0/+14 |
| | | | | |||||
| * | | | Refactored true/false checks in test cases | NicoleYarroch | 2019-08-14 | 3 | -52/+23 |
| | | | | |||||
| * | | | `presentKeyboard` no longer deprecated | NicoleYarroch | 2019-08-14 | 1 | -12/+1 |
| | | | | |||||
| * | | | Added nullable to `presentKeyboard()` return value | NicoleYarroch | 2019-08-14 | 3 | -3/+3 |
| | | | | |||||
| * | | | Fixed spacing | NicoleYarroch | 2019-08-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | Removed unused imports | NicoleYarroch | 2019-08-14 | 1 | -4/+0 |
| | | | | |||||
| * | | | Added check for canceled threads. | NicoleYarroch | 2019-08-14 | 6 | -34/+109 |
| | | | | |||||
| * | | | Keyboard now cancels with `cancelID` | NicoleYarroch | 2019-08-13 | 6 | -69/+160 |
| | | | | | | | | | | | | | | | | Test cases fixed | ||||
| * | | | Refactored cancelID, added spec version check | NicoleYarroch | 2019-08-12 | 6 | -17/+60 |
| | | | | |||||
| * | | | Refactored the dismiss keyboard methods | NicoleYarroch | 2019-08-12 | 2 | -17/+28 |
| | | | | |||||
| * | | | Test cases added for dismissing keyboard w manager | NicoleYarroch | 2019-08-12 | 2 | -3/+21 |
| | | | | |||||
| * | | | Added cancel id documentation to modal views | NicoleYarroch | 2019-08-08 | 4 | -4/+11 |
| | | | | |||||
| * | | | Added cancel interaction to SdlProxyBase | NicoleYarroch | 2019-08-08 | 1 | -0/+16 |
| | | | | |||||
| * | | | Fix for SdlProxyBase | NicoleYarroch | 2019-08-08 | 1 | -8354/+8354 |
| | | | | |||||
| * | | | Fixing SdlProxyBase merge conflict | NicoleYarroch | 2019-08-08 | 1 | -1553/+1537 |
| | | | | |||||
| * | | | Renamed cancel keyboard method | NicoleYarroch | 2019-08-07 | 4 | -9/+7 |
| | | | | |||||
| * | | | Removed unused imports from test | NicoleYarroch | 2019-08-07 | 3 | -3/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into feature/issue_840_cancel_interaction_RPC | NicoleYarroch | 2019-08-07 | 29 | -8550/+9308 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java # android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java # base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java | ||||
| * | | | | Added logic to dismiss keyboard | NicoleYarroch | 2019-08-02 | 1 | -16/+8 |
| | | | | | |||||
| * | | | | Fixed order of finishing for operations | NicoleYarroch | 2019-08-02 | 5 | -49/+28 |
| | | | | | |||||
| * | | | | Fixed functionID for cancel interaction RPC | NicoleYarroch | 2019-08-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added logic and test cases for dismissing keyboard | NicoleYarroch | 2019-07-31 | 4 | -10/+175 |
| | | | | | |||||
| * | | | | Removed “stop” thread command | NicoleYarroch | 2019-07-30 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fixed logging order | NicoleYarroch | 2019-07-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added test cases for canceling a choice set | NicoleYarroch | 2019-07-30 | 1 | -3/+128 |
| | | | | | |||||
| * | | | | Added NPE checks for listener | NicoleYarroch | 2019-07-30 | 1 | -12/+19 |
| | | | | |