summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into bugfix/issue_1385bugfix/issue_1385RHenigan2020-06-3063-1487/+2765
|\
| * Merge pull request #1401 from smartdevicelink/bugfix/issue_1400Bilal Alsharifi2020-06-302-3/+22
| |\
| | * Merge branch 'develop' into bugfix/issue_1400RHenigan2020-06-3014-407/+800
| | |\ | | |/ | |/|
| * | Merge pull request #1391 from smartdevicelink/feature/subscribe_buttonsBilal Alsharifi2020-06-308-7/+498
| |\ \
| | * | Fixed potential NPE and removed log statementJulian Kast2020-06-301-2/+4
| | * | Fixed unit testfeature/subscribe_buttonsJulian Kast2020-06-291-1/+1
| | * | Fixing wording to make sure text will appear on screen, In JavaSe the full me...Julian Kast2020-06-292-4/+6
| | * | Adding missed buttonNameJulian Kast2020-06-292-2/+2
| | * | Added unsubscribeButtonRequest method and fixed spacingJulian Kast2020-06-291-7/+9
| | * | Fixed dispose message as well as some log messages and listener messagesJulian Kast2020-06-291-14/+8
| | * | Fixed Unit testJulian Kast2020-06-291-1/+1
| | * | Updating hello sdl example appsJulian Kast2020-06-292-22/+10
| | * | Updated hello sdl example appsJulian Kast2020-06-292-38/+17
| | * | Fixed importsJulian Kast2020-06-291-1/+0
| | * | Fixed formattingJulian Kast2020-06-291-21/+21
| | * | Move OnButtonListener to same package as screen managerJulian Kast2020-06-295-34/+32
| | * | Added subscribe to preset buttons to hello_sdl for android and javaSEJulian Kast2020-06-242-2/+98
| | * | Added Unit test and fixed formattingJulian Kast2020-06-242-12/+69
| | * | removed unused codeJulian Kast2020-06-241-2/+0
| | * | removed unused importsJulian Kast2020-06-241-1/+0
| | * | Removed unused menuCellJulian Kast2020-06-241-10/+0
| | * | removed unused importsJulian Kast2020-06-241-2/+0
| | * | Changed logic of when listeners get addedJulian Kast2020-06-242-40/+19
| | * | Added subscribe button capabilities to all hard buttons in example appJulian Kast2020-06-241-16/+31
| | * | Added TestJulian Kast2020-06-241-3/+6
| | * | Added logic for SubscribeButtonManager States in ScreenManagerJulian Kast2020-06-241-4/+8
| | * | Added more unit test and fixed formattingJulian Kast2020-06-242-8/+15
| | * | Merge branch 'develop' into feature/subscribe_buttonsJulian Kast2020-06-236-50/+36
| | |\ \
| | * | | Fixed symlinkJulian Kast2020-06-231-1/+1
| | * | | Moved OnButtonListener folder and created a symlink for androidJulian Kast2020-06-232-31/+32
| | * | | Changed value from private to package privateJulian Kast2020-06-231-1/+1
| | * | | Added dispose() to SubscribeButtonManagerJulian Kast2020-06-231-5/+17
| | * | | Added unit test for SubscribeButtonManagerJulian Kast2020-06-231-0/+92
| | * | | Added JavaDocs to SubscribeButtonManager and OnButtonListenerJulian Kast2020-06-233-2/+55
| | * | | Fixed ordering of null error checkJulian Kast2020-06-231-5/+5
| | * | | Moved OnButtonListener to manager packageJulian Kast2020-06-234-10/+41
| | * | | Added Base class for subscribeButton Manager then created two SubscribeButton...Julian Kast2020-06-233-3/+35
| | * | | Fixed formatting in SubscribeButtonManagerJulian Kast2020-06-221-54/+48
| | * | | Added subscribeButtonManager, OnButtonListener, add subscribeButton functiona...Julian Kast2020-06-223-0/+166
| * | | | Merge pull request #1399 from smartdevicelink/bugfix/refactor_lcm_updatesBilal Alsharifi2020-06-306-392/+294
| |\ \ \ \
| | * | | | Remove unused methods in base LCMJoey Grover2020-06-301-7/+2
| | * | | | Remove unused importsJoey Grover2020-06-301-4/+0
| | * | | | Refactor TransportBroker to fit with LCMbugfix/refactor_lcm_updatesJoey Grover2020-06-261-61/+41
| | * | | | Add synchronized lock to lcm.stopJoey Grover2020-06-261-3/+6
| | * | | | Add synchronized lock to sdlmanager.disposeJoey Grover2020-06-261-1/+1
| | * | | | Remove unused state booleansJoey Grover2020-06-261-35/+1
| | * | | | Remove unused return value from tryVideoStreamJoey Grover2020-06-261-13/+4
| | * | | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2020-06-2645-996/+1469
| | |\ \ \ \
| | * | | | | Remove unncessary sleeps and extra classesJoey Grover2020-06-252-57/+11
| | * | | | | Rename callbacks to better reflect eventsJoey Grover2020-06-252-19/+18