delta/smartdevicelink/sdl_android.git - github.com: smartdevicelink/sdl

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update BSON to RC1_1.2.2feature/bson_RC1_1.2.2	Bilal Alsharifi	2020-09-21	1	-1/+1
\|
*	Merge pull request #1508 from smartdevicelink/feature/hmi_capabilities_fix	Robert Henigan	2020-09-21	3	-4/+6
\|\ \| \| \| \|	Fix inconsistency with HMICapabilities API names
\| *	Fix unit testsfeature/hmi_capabilities_fix	Bilal Alsharifi	2020-09-21	1	-0/+2
\| \|
\| *	Update HMICapabilities APIs names	Bilal Alsharifi	2020-09-21	2	-4/+4
\|/
*	Merge pull request #1505 from smartdevicelink/feature/code_formatting	Robert Henigan	2020-09-21	1102	-76645/+78770
\|\ \| \| \| \|	Reformat project code
\| *	Reformat RTPH264Packetizer & StreamPacketizer	Bilal Alsharifi	2020-09-21	2	-666/+659
\| \|
\| *	Merge branch 'develop' into feature/code_formatting	Bilal Alsharifi	2020-09-21	2	-642/+667
\| \|\ \| \|/ \|/\| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java # base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
* \|	Merge pull request #1480 from smartdevicelink/bugfix/issue_1398	Julian Kast	2020-09-21	2	-2/+20
\|\ \ \| \| \| \| \| \|	Fix Issue 1398 - Avoid deadlock from using blocking queues
\| * \|	Fix potential deadlock in media streaming classesbugfix/issue_1398	Joey Grover	2020-09-02	2	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1398
\| \| *	Fix fomratting per code reviewfeature/code_formatting	Bilal Alsharifi	2020-09-18	2	-78/+20
\| \| \|
\| \| *	Remove extra semicolons	Bilal Alsharifi	2020-09-18	2	-3/+0
\| \| \|
\| \| *	Remove extra semicolon	Bilal Alsharifi	2020-09-18	1	-1/+0
\| \| \|
\| \| *	Fix unit tests	Bilal Alsharifi	2020-09-17	2	-1/+7
\| \| \|
\| \| *	Merge branch 'develop' into feature/code_formatting	Bilal Alsharifi	2020-09-17	2	-51/+33
\| \| \|\ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java
* \| \|	Merge pull request #1504 from smartdevicelink/feature/fix_tests	Robert Henigan	2020-09-17	2	-51/+36
\|\ \ \ \| \| \| \| \| \| \| \|	Fix HapticInterfaceManagerTest
\| * \| \|	Fix HapticInterfaceManagerTestfeature/fix_tests	Bilal Alsharifi	2020-09-17	1	-34/+36
\| \| \| \|
\| * \| \|	Move HapticInterfaceManagerTest to androidTest	Bilal Alsharifi	2020-09-17	2	-17/+0
\| \| \| \|
\| \| \| *	Run the Reformat Code tool on the project	Bilal Alsharifi	2020-09-17	1102	-76629/+78813
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #1503 from smartdevicelink/feature/fix_todos	Robert Henigan	2020-09-17	5	-14/+31
\|\ \ \ \| \| \| \| \| \| \| \|	Fix some todo comments
\| * \| \|	Fix todo in SdlPacketTests	Bilal Alsharifi	2020-09-17	1	-1/+13
\| \| \| \|
\| * \| \|	Fix some todosfeature/fix_todos	Bilal Alsharifi	2020-09-17	4	-13/+18
\| \|/ /
* \| \|	Merge pull request #1453 from ↵	Robert Henigan	2020-09-17	10	-48/+57
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	smartdevicelink/feature/issue_1448_generate_deprecated_javadoc Generate @deprecated annotation in JavaDocs when applicable
\| * \ \	Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadocfeature/issue_1448_generate_deprecated_javadoc	Bilal Alsharifi	2020-09-16	402	-1646/+1749
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadoc	Bilal Alsharifi	2020-09-09	465	-36180/+11030
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadoc	Bilal Alsharifi	2020-08-21	110	-2432/+1522
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Add correct version info to generated classes javadoc headers	Bilal Alsharifi	2020-08-21	1	-1/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update formatting in RPC generator	Bilal Alsharifi	2020-08-21	3	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename javadoc_added_deprecated.java to javadoc_version_info.java	Bilal Alsharifi	2020-08-21	7	-17/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix issue in javadoc_added_deprecated.java	Bilal Alsharifi	2020-08-21	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update logic in javadoc_added_deprecated	Bilal Alsharifi	2020-08-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor since & deprecated generation format	Bilal Alsharifi	2020-08-20	1	-5/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Pass history to template	Bilal Alsharifi	2020-08-20	3	-0/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	pass history to javadoc_added_deprecated	Bilal Alsharifi	2020-08-20	5	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add missing deprecated annotations to getters and setters	Bilal Alsharifi	2020-08-20	2	-0/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update spacing	Bilal Alsharifi	2020-08-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add javadoc_added_deprecated.java to reuse same logic for in multiple files	Bilal Alsharifi	2020-08-20	7	-67/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Generate correct JavaDoc for deprecated APIs	Bilal Alsharifi	2020-08-17	6	-9/+30
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	[SDL 0278] Screen Manager Template Management (#1492)	Julian Kast	2020-09-17	7	-140/+605
\| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Work in Progress * BaseTextAndGraphicsManager changes * TextAndGraphicsUpdateOperation updates for template management * TextAndGraphicsState updates for template managment * remove comment and fix existing unit test * Added getTemplateConfiguration method and made currentState method package private * Add test to TextAndGraphicManagerTest * Fix unit test and remove commented out code * Fix test to expand code cov * Remove added constructors and use chainable setters * Fix error in shouldUpdateTemplateConfig method * Added unit test to test template change * Added unit test * Added check to cancel the operation if text / layout changes and images still need to be uploaded * Add unit test for if a show fails * Added comments and simplified logic * Fix comparing TemplateConfigurations * Add comments and fix formatting * Add java Docs to baseScreenManager * Change name of var and fix formatiing * Added final to vars that go reverted when fixing merge conflicts * Add @nonNull to templateConfiguration * Removing sending newScreenData to updatePendingOperationsWithNewScreenData as it is equal to currentScreenData at this point * Make setLayout var local * Fixing error where setDisplayLayout dosn't call listener if it fails * Added showRPCSupportsTemplateConfiguration() Method to T&G update operation * Added check to make sure we don't get an npe if internalInterface is null * added check to make sure we don't send an unnecessary templateConfig with show * Fixed issue with setDisplayLayout request updating capabilities when request fails * Documentation updates to screenManager * Formatting fix * Fix javaDocs and comments * Fixed issue with updateCurrentScreenDataFromShow * Change TextsAndGraphicsState to TextAndGraphicState to align with IOS Co-authored-by: Julian Kast <julian@livio.com>
* \| \| \| \| \|	Merge pull request #1494 from smartdevicelink/feature/fix_rpcs_mismatch	Julian Kast	2020-09-16	17	-112/+253
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix RPCs Mismatches
\| * \| \| \| \| \|	fix constructor in setPressureTelltale to use new method as old one is ↵	Julian Kast	2020-09-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deprecated due to mistake
\| * \| \| \| \| \|	Add javadoc to new & deprecated methodsfeature/fix_rpcs_mismatch	Bilal Alsharifi	2020-09-16	7	-17/+96
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' into feature/fix_rpcs_mismatch	Bilal Alsharifi	2020-09-15	195	-1222/+1051
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java # base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
\| * \| \| \| \| \| \|	Undo some deprecations	Bilal Alsharifi	2020-09-14	3	-30/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Simplify RPCGenericTests cases	Bilal Alsharifi	2020-09-14	1	-36/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix RPCs mismatch part 2	Bilal Alsharifi	2020-09-14	2	-40/+52
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix RPCs mismatch part 1	Bilal Alsharifi	2020-09-11	4	-22/+41
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add missing RPC params	Bilal Alsharifi	2020-09-11	13	-35/+109
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Deprecate SupportedSeat	Bilal Alsharifi	2020-09-11	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1502 from smartdevicelink/feature/cleanup_javadocs	Bilal Alsharifi	2020-09-16	203	-222/+206
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	Fix JavaDocs in Test files for the correct rpc file paths
\| * \| \| \| \| \| \|	Fix javadoc errors in unit testsfeature/cleanup_javadocs	Bilal Alsharifi	2020-09-16	11	-30/+14
\| \| \| \| \| \| \| \|