Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Feature/api view #301

Closed
wants to merge 312 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
312 commits
Select commit Hold shift + click to select a range
7f871c6
Added view package to api.
tstrayer-ford Apr 15, 2016
f897213
Updated documentation for the permissions package
Apr 15, 2016
61e7182
Removed PullToTop tests
Apr 15, 2016
358c265
Merge branch 'feature/permission_manager' into feature/permission_man…
Apr 15, 2016
9379dcc
Permission manager tests for verifying enum state on permission chang…
Apr 15, 2016
e2ce3d0
Added implementation for SdlTemplateView. Currently depends heavily o…
tstrayer-ford Apr 16, 2016
50f9dbf
Added tests for permission changes between HMI levels
Apr 18, 2016
e238354
Fix for wrong HMI Status being checked for HMI Level changes and corr…
Apr 18, 2016
11a3b81
Merge branch 'feature/permission_manager' into feature/permission_man…
Apr 18, 2016
c7bc644
Support for parameter permission tests added
Apr 18, 2016
66dbe14
Added checks for the correct EnumSet from the event
Apr 18, 2016
0a232cc
Added missing enums into the SdlPermission
Apr 18, 2016
c3a1a7e
Merge branch 'feature/permission_manager' into feature/permission_man…
Apr 18, 2016
3a8277a
Added test to cover all SdlPermissions possible
Apr 18, 2016
e255d02
Clean up of SdlPermissionManager Tests
Apr 19, 2016
8030cd0
Some additional changes that should have been part of the last commit
Apr 19, 2016
f4c2dcf
Added tests to make sure with multiple listeners that each receives a…
Apr 19, 2016
60eee98
Finished initial implementation for Template view. Updated SdlView ab…
tstrayer-ford Apr 20, 2016
ad85036
Added button listeners and registry to SdlApplication. Added methods …
tstrayer-ford Apr 20, 2016
3395374
Merge branch 'feature/api_lifecycle' into feature/api_view
tstrayer-ford Apr 20, 2016
2ea5748
Merge branch 'feature/api_lifecycle' into feature/api_file
tstrayer-ford Apr 20, 2016
67a6886
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Apr 21, 2016
d4581f8
Changed getter for a single permission to be for the current hmi
Apr 21, 2016
6975240
Start of the PushNotificationBuilder for the interaction package
Apr 21, 2016
480cca8
Added responses back to the listener for the push notification
Apr 21, 2016
2654be2
Corrected structure and naming of the PushNotification to now be the …
Apr 21, 2016
5d179dd
Start of the SdlAlertDialog implementation, only allows for the alert…
Apr 21, 2016
395c24a
Securing the SdlAlertDialog from improper sending
Apr 21, 2016
5cd2183
Moved the context to the show instead of the creation of the PushNoti…
Apr 22, 2016
92372e3
Merge branch 'feature/api_view' into feature/api_interaction
Apr 22, 2016
cbd0d59
Logic for the buttons added to the SdlAlertDialog and SdlPushNotifica…
Apr 25, 2016
a9cfdff
Further clean up of the AlertDialog and the PushNotification, along w…
Apr 25, 2016
ca64e9b
Keep SdlButton commented out for now
Apr 25, 2016
49e78c7
Commented the SdlAlertDialog and the SdlPushNotification
Apr 25, 2016
4e2b1fe
Fix for the lifecycle hmi change callback being called before the per…
Apr 26, 2016
0d84251
Merge branch 'feature/permission_manager' into feature/api_interaction
Apr 26, 2016
42502d0
Updates to SdlAlertDialog and SdlPushNotification to prevent successi…
Apr 27, 2016
dce31a5
View working with text and buttons with no graphics.
tstrayer-ford Apr 28, 2016
1cd1992
Added graphic handling for SdlGraphicView.
tstrayer-ford Apr 29, 2016
be8c3b2
Logic in place so that if the image is not ready by the time the show…
May 2, 2016
1077e97
Added option to SdlButton to prefer graphic only display.
tstrayer-ford May 2, 2016
ebd42e9
Added ability to clear a graphic from the screen.
tstrayer-ford May 3, 2016
b9292b5
Removed invisible image for clearing. Better work around found.
tstrayer-ford May 3, 2016
2567862
Merge branch 'feature/api_file' into feature/api_view
tstrayer-ford May 3, 2016
173cb8b
Merged in interaction branch due to dependence on view classes.
tstrayer-ford May 3, 2016
97c30f3
Refactored SdlAlertDialog and SdlPushNotification to have a common class
May 3, 2016
d973a9f
Stubbed in classes for menus.
tstrayer-ford May 4, 2016
3b5453c
Merge branch 'feature/api_file' into feature/api_menus
tstrayer-ford May 4, 2016
1ad97c2
Merge branch 'develop' into feature/api_lifecycle
tstrayer-ford May 4, 2016
e9a5fc3
Removed build.gradle from index.
tstrayer-ford May 4, 2016
1a67527
Finished clean up after merge.
tstrayer-ford May 4, 2016
2a5b831
Merge branch 'feature/api_lifecycle' into feature/api_view
tstrayer-ford May 4, 2016
88859ee
Merge branch 'feature/api_lifecycle' into feature/api_file
tstrayer-ford May 4, 2016
f194971
Merge branch 'feature/permission_manager' into feature/api_perform_in…
May 4, 2016
dfb2354
Merge branch 'feature/api_file' into feature/api_perform_interaction
May 4, 2016
4d3d111
Merge branch 'feature/api_lifecycle' into feature/api_menus
tstrayer-ford May 4, 2016
ab52d5e
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford May 4, 2016
060ddb9
Initial SdlChoiceSetManager along with models
May 4, 2016
d5800b9
Added getter for the SdlChoiceSetManager to the SdlContext, also addi…
May 4, 2016
ef8f70d
Upload with SdlChoiceSetManager requires user to call create method now
May 4, 2016
66114d1
Initial implementation complete. Does not yet support adding menu ite…
tstrayer-ford May 5, 2016
cb16370
First implementation of the SdlChoiceDialog, able to use most Perform…
May 5, 2016
085abc6
Resuse of already created ChoiceSets on the module is now supported
May 6, 2016
2aee8a1
Cleanup of SdlChoiceDialog
May 6, 2016
4e31d28
Grouping ManualInteraction and VoiceInteraction properties together f…
May 9, 2016
9be8c80
Moved out the ManualInteraction and VoiceInteraction for easier reada…
May 10, 2016
b9ef0d2
Removed logging as it is being moved to SdlApplication.
tstrayer-ford May 10, 2016
c4d29c9
Fixed issue with images not showing in menu. Fixed issue with ID/Name…
tstrayer-ford May 10, 2016
fdbc8dc
Added logging for all rpc requests and responses.
tstrayer-ford May 10, 2016
bf2ed18
Removed logging from SdlViewManager.
tstrayer-ford May 10, 2016
8d71f69
Merge branch 'feature/api_lifecycle' into feature/api_file
tstrayer-ford May 10, 2016
626e318
Merge branch 'feature/api_lifecycle' into feature/api_view
tstrayer-ford May 10, 2016
935ef9e
Merge branch 'feature/api_menus' into feature/api_lifecycle
tstrayer-ford May 10, 2016
c2f9575
Merge branch 'feature/api_lifecycle' into feature/api_view
tstrayer-ford May 10, 2016
d15437f
Merge branch 'feature/api_lifecycle' into feature/api_file
tstrayer-ford May 10, 2016
fda56b8
Clean up and bug fixing of current SdlChoice package
May 10, 2016
7bfb29e
Remove accidental push of RPC logging from SdlApplication to perform_…
May 10, 2016
6219116
Merge branch 'feature/api_file' into feature/api_perform_interaction
May 11, 2016
4842566
Additional fix in the deleting of choice sets, also added in extra lo…
May 12, 2016
1352529
Menu debugging.
tstrayer-ford May 17, 2016
6ed0d8e
Refactor from code review.
tstrayer-ford May 17, 2016
9c04c43
First implementation of the SdlSlideControl for easy construction and…
May 20, 2016
155f3c0
Fix for no valid test cases being found with the SdlPermissionManager…
May 20, 2016
452eb79
Merge branch 'feature/permission_manager_testing' into feature/permis…
May 20, 2016
bcc6651
Refactored SdlChoiceSetCreation to be SdlChoiceSet to remove redundan…
May 26, 2016
be45270
Initial implementation of SDL execution handler thread in SdlApplicat…
tstrayer-ford Jun 7, 2016
5f1dff1
Merge branch 'feature/api_lifecycle' into feature/api_view
tstrayer-ford Jun 7, 2016
107dd65
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Jun 7, 2016
0629360
Refactored the permission manager to use method calls instead of noti…
tstrayer-ford Jun 7, 2016
6dea6cd
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Jun 7, 2016
582dc17
Fixed bug causing null pointer when attempting to create the Handler …
tstrayer-ford Jun 7, 2016
5207683
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Jun 7, 2016
ed6fda4
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Jun 7, 2016
6a0e47a
First implementation of the SdlAudioPassThruDialog
Jun 7, 2016
8e6b4fd
Fixed the unit tests to be aligned with the refactored Permission man…
Jun 7, 2016
4f3a95c
Initial implementation of the SdlInformationDialog along with refacto…
Jun 8, 2016
a326180
Fixed bug that caused the request to be logged to logcat in place of …
tstrayer-ford Jun 8, 2016
bf4618a
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Jun 8, 2016
81eb207
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Jun 8, 2016
d713095
Added success response callback for SdlAudioPassThruDialog
Jun 8, 2016
e562d73
RPC Responses are now logged to different log levels based on the res…
tstrayer-ford Jun 9, 2016
44d4074
Merge branch 'feature/api_lifecycle' into feature/api_view
tstrayer-ford Jun 9, 2016
6e78fc2
Added checking to SdlViewManager to make sure that the template requi…
tstrayer-ford Jun 9, 2016
f658e85
Renamed the base classes for alerts and scrollable message to be cons…
Jun 14, 2016
5a96aac
Added catch for invalid RPC names when handling OnPermissionChange.
tstrayer-ford Jun 16, 2016
0ab9aec
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Jun 16, 2016
5430d60
Merge branch 'develop' into feature/api_lifecycle
tstrayer-ford Jun 16, 2016
7b2e20b
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Jun 16, 2016
7e98898
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Jun 16, 2016
c6390b7
Refactor of the Alerts,Information Dialog, APT and Slider to use a co…
Jun 20, 2016
9a30214
Moved the SdlInteractionResponseListener to the interface package
Jun 20, 2016
4403faa
Merge branch 'feature/api_view' into feature/api_perform_interaction
Jun 21, 2016
8ea2514
Refactored once more, moved simple interaction response handler funct…
Jun 21, 2016
453fe03
Merge branch 'feature/api_view' into feature/api_perform_interaction
Jun 21, 2016
c3d92f5
Moved the choice set classes into the view package and reworked the S…
Jun 21, 2016
c4ae251
SdlChoiceSets that are identical in structure to those already sent t…
Jun 24, 2016
5eaa2e2
Stubbed int MenuManager classes. Remaned SdlMenuEntry to SdlMenuOptio…
tstrayer-ford Jul 19, 2016
9e6890b
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Jul 20, 2016
4d7bc13
Finished implementation of MenuManager and SdlMenuTransaction. Added …
tstrayer-ford Jul 25, 2016
2cb5a89
Added ability to check a menu to see if it contains a specific item o…
tstrayer-ford Jul 25, 2016
a0e2144
SdlPermissionFilter is now immutable, able to remove listeners from t…
Jul 27, 2016
9cda9f7
Debugged issue related to try to keep add commands in order. Seems to…
tstrayer-ford Jul 28, 2016
bac14be
Added onCreate, onConnect, and onDisconenct callbacks to SdlApplicati…
tstrayer-ford Jul 28, 2016
9bb2742
Updated SdlApplicationConfig so that build returns itself for chainging.
tstrayer-ford Jul 28, 2016
b8e5d60
SdlApplication.onConnect() now called during first HMI none. SdlAppli…
tstrayer-ford Jul 28, 2016
b50e979
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Jul 28, 2016
dc0cde0
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Jul 28, 2016
eb67548
Implementation for when images are not uploaded at choice set creatio…
Jul 28, 2016
1c44357
Merge branch 'feature/api_view' into feature/api_perform_interaction
Jul 28, 2016
9112dce
Added registration for RPCNotificationListeners.
tstrayer-ford Jul 28, 2016
a593526
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Jul 28, 2016
2b268b1
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Jul 28, 2016
8c6a816
Added final to view specific methods in SdlApplication, also hid inte…
Jul 29, 2016
e3dec4c
Fixed issue with setting SdlContext on view implementations that requ…
tstrayer-ford Aug 2, 2016
e1dd617
Fixed issue with intercepting the listener on RPC requests for loggin…
tstrayer-ford Aug 2, 2016
2e4afd9
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Aug 2, 2016
1fdbd50
Merge branch 'feature/api_view' of github.com:FordDev/sdl_android int…
tstrayer-ford Aug 2, 2016
07a8c53
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Aug 2, 2016
45b6746
Added methods to get HMICapabilities, DisplayCapabilities, and Vehicl…
tstrayer-ford Aug 3, 2016
14a21ad
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Aug 3, 2016
05625f8
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Aug 3, 2016
4848b40
Added ability to pass a bundle to new SdlActivities as they are being…
tstrayer-ford Aug 3, 2016
35c82e2
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Aug 3, 2016
fba169f
Added SendLocation to SdlPermission enum.
tstrayer-ford Aug 3, 2016
bdf50b7
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Aug 3, 2016
a362618
Fixed missing argument in SdlActivityManager#startSdlActivity
tstrayer-ford Aug 3, 2016
b15b25c
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Aug 3, 2016
7b56276
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Aug 3, 2016
23b2b4f
Fixed issue preventing template from changing during back navigation.
tstrayer-ford Aug 3, 2016
bb8dd03
Added getter for Sdl Message Version. Declared several SdlContext met…
tstrayer-ford Aug 4, 2016
9d593c7
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Aug 4, 2016
c448139
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Aug 4, 2016
f3a8608
Fixes for popups that use buttons, but are not provided buttons by th…
Aug 5, 2016
e6dedb3
Fix test activity's OnCreate to match new OnCreate method
Aug 5, 2016
1073149
Fix the UnitTestSdlActivityManager to be able to instantiate SdlAppli…
Aug 5, 2016
a5a925e
Added null checks to SdlBluetoothReceiver to prevent crashes on deliv…
tstrayer-ford Aug 5, 2016
1a37c34
Fixed SdlFileManager so that files that are set to upload before list…
tstrayer-ford Aug 8, 2016
e065480
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Aug 8, 2016
1c11bab
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Aug 8, 2016
b85d826
Fixed but in SdlGraphicView that was preventing new files from being …
tstrayer-ford Aug 8, 2016
bca041f
Merge branch 'feature/permission_manager' of github.com:FordDev/sdl_a…
tstrayer-ford Aug 8, 2016
052b201
Merge branch 'feature/api_view' of github.com:FordDev/sdl_android int…
tstrayer-ford Aug 8, 2016
26f339c
Updated Permissons constants for DialNumber and Waypoints
Aug 15, 2016
678923a
Changed getExecutionHandler to getSdlExecutionLooper and changed retu…
tstrayer-ford Aug 26, 2016
b4678a2
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Aug 26, 2016
bc06c0d
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Aug 26, 2016
c3e1fb2
Fixed possibly crash if RpcNotificationListeners are added or removed…
tstrayer-ford Aug 30, 2016
e45395f
Implementation of language change on connect with wrong language
Sep 1, 2016
65f75c6
Supporting being able to be found again properly after a language cha…
Sep 6, 2016
41e006f
Default language added to supported languages on building of SdlAppli…
Sep 6, 2016
5d1564d
Fix for concurrent modificatin that can happen on the same thread, al…
Sep 8, 2016
cc095cd
Changed includeBackButton method in SdlButtonView to allow for overri…
tstrayer-ford Sep 9, 2016
5b15f9a
Fixed a bug that prevented a notification listener from being registe…
tstrayer-ford Sep 12, 2016
67b47e9
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Sep 12, 2016
5e0195b
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Sep 12, 2016
abcdc51
Merge branch 'feature/api_language_change' into feature/api_lifecycle
Sep 15, 2016
99acbca
Fix for the menus persisting internally between a language change rec…
Sep 15, 2016
d1cbd87
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Sep 15, 2016
7012766
Merge branch 'feature/permission_manager' into feature/api_view
Sep 15, 2016
740ac7a
Fix for the ChoiceSetManager persisting information between connectio…
Sep 15, 2016
706cd64
Fix for null listener being added when uploading a file
Sep 19, 2016
29daf12
Fix for sending change registration when vr is not ready on ignition …
Sep 19, 2016
f2dee6b
Added pull to top option to launching SdlActivities. This removes the…
tstrayer-ford Sep 28, 2016
3b451cc
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Sep 28, 2016
f86437f
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Sep 28, 2016
55120ba
Fixed a bug that would cause a crash when sending a back button with …
tstrayer-ford Sep 28, 2016
48c920e
Change so that if the choice image upload fails when sending a choice…
Oct 3, 2016
79b6473
Implemented the ability to be able to set the global properties withi…
Oct 5, 2016
34e25eb
Fix for crash when trying to send ResetGlobalProperties
Oct 5, 2016
5d24828
Series of SetGlobalProperties are now squashed into a single SetGloba…
Oct 7, 2016
234d1f0
Modified the SdlGlobalProperties object to contain collections for TT…
Oct 7, 2016
614a89f
Merge branch 'feature/api_lifecycle' into feature/permission_manager
mschwerz-ford Oct 7, 2016
043994e
Merge branch 'feature/permission_manager' into feature/api_view
mschwerz-ford Oct 7, 2016
789d180
Reduced logging in SdlView and children.
tstrayer-ford Oct 11, 2016
1842823
Cleaned up some logging in SdlApplication.
tstrayer-ford Oct 11, 2016
a4ed975
Merge branch 'feature/api_lifecycle' into feature/permission_manager
tstrayer-ford Oct 11, 2016
ac846eb
Removed unnecessary logging from SdlViewManager.
tstrayer-ford Oct 11, 2016
8fd4544
Merge branch 'feature/permission_manager' into feature/api_view
tstrayer-ford Oct 11, 2016
991d407
Added the DD state to the SdlContext
mschwerz-ford Oct 21, 2016
d8e02e6
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Oct 26, 2016
d91c48e
Merge branch 'feature/permission_manager' into feature/api_view
Oct 26, 2016
f02e1df
Implementation of the SdlVoiceOption to allow for transactional voice…
mschwerz-ford Nov 23, 2016
bc26fb3
Merge branch 'feature/api_lifecycle' into feature/permission_manager
mschwerz-ford Nov 23, 2016
58410fa
Merge branch 'feature/permission_manager' into feature/api_view
mschwerz-ford Nov 23, 2016
35baa63
Fix for ChangeRegistration being sent for the language that SDL was c…
Dec 7, 2016
18bebfe
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Dec 7, 2016
3ef3f07
Merge branch 'feature/permission_manager' into feature/api_view
Dec 7, 2016
bc54ca6
Timeout added for when trying to reconnect on language change
Dec 7, 2016
b5f45cf
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Dec 7, 2016
88220f6
Merge branch 'feature/permission_manager' into feature/api_view
Dec 7, 2016
825175f
Fix for crash when trying to cast BinderProxy to SdlConnectionBinder
Dec 14, 2016
44de92d
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Dec 14, 2016
abdc393
Merge branch 'feature/permission_manager' into feature/api_view
Dec 14, 2016
e9a769c
Added highlight property to the SdlButton and implemented highlight f…
Jan 9, 2017
315dc91
Implemented highlight functionality for interaction views
Jan 9, 2017
fe1d573
Fix for a SetGlobalProperties RPC being sent everytime update is called
Feb 7, 2017
cc97435
Cleaned up the change to the SdlGlobalPropertiesManager
Feb 8, 2017
e97c938
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Feb 8, 2017
0c50e9b
Merge branch 'feature/permission_manager' into feature/api_view
Feb 8, 2017
bec7ba1
Fixed a bug that lead to a crash if SdlButtonView had been cleared wh…
tstrayer-ford Feb 22, 2017
7027f00
Merge branch 'feature/api_view' of github.com:FordDev/sdl_android int…
tstrayer-ford Feb 22, 2017
4c0d9e6
Made SdlPermissionEvent getters non final to allow for easier testing…
tstrayer-ford Feb 22, 2017
262ee99
Fixed an issue that could result in a concurrent modification excepti…
tstrayer-ford Mar 7, 2017
74b24e1
Fixed an issue that would result in a crash if the developer tried to…
tstrayer-ford Mar 8, 2017
893a42c
User disallowed and disallowed permissions added to the permission ma…
mschwerz-ford Mar 13, 2017
818b0ed
Corrected the parsing of the permission parameters to be the right level
mschwerz-ford Mar 13, 2017
cfaea57
Fixed user disallowed not getting propagated to parameters for allowe…
Mar 16, 2017
cc47d72
Merge branch 'feature/permission_manager' into feature/api_view
Mar 16, 2017
4da228b
Blanking out the show before decorating the show. Also creating a new…
Apr 12, 2017
b340e2f
Fixed the setButtons method to actually register button callbacks.
May 2, 2017
94d67c6
Fix for the set buttons being out of order with the SdlButtonView.
May 22, 2017
ef6e30d
Fix to the ChoiceSets that were not comparing the choices correctly o…
Jul 20, 2017
fe548f8
Fix for a crash when removing an entry from the key list for SdlMenu.
Aug 3, 2017
594f84f
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Aug 3, 2017
a7509e6
Merge branch 'feature/permission_manager' into feature/api_view
Aug 3, 2017
16ebc86
Fix so that we do not crash on the log statement comparing languages …
Aug 7, 2017
e53371f
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Aug 7, 2017
b2749ea
Merge branch 'feature/permission_manager' into feature/api_view
Aug 7, 2017
70b53bc
Added a call to ViewManager.updateView() to SdlActivity.performStart(…
tstrayer-ford Aug 21, 2017
4a77c68
Making sure we are not sending a null initial prompt with the SdlChoi…
Sep 5, 2017
8f341f3
Fix so that unknown subpermissions do not crash the library. Added ne…
Oct 2, 2017
1f02e88
Merge branch 'feature/permission_manager' into feature/api_view
Oct 2, 2017
858493e
Fix for an issue where choice sets were not being removed from the ma…
Nov 8, 2017
c728177
Added the ability to grab the software version reported by the physic…
Nov 16, 2017
a189cbb
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Nov 16, 2017
f7b2edb
Merge branch 'feature/permission_manager' into feature/api_view
Nov 16, 2017
daed78f
Added the System Action to the SdlButton which allows for things such…
Nov 16, 2017
fda70d6
Making sure we clear the File set with the SdlFileManager when we try…
Feb 8, 2018
9b2c830
Merge branch 'feature/api_lifecycle' into feature/permission_manager
Feb 8, 2018
ddd56fc
Merge branch 'feature/permission_manager' into feature/api_view
Feb 8, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 26 additions & 42 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,46 +1,23 @@
##############################
# Project Specific
##############################


##############################
# OS generated files
##############################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

##############################
# built application files
##############################
*.apk
*.ap_

##############################
# files for the dex VM
##############################
*.dex

##############################
# Java class files
##############################
*.class

##############################
# Generated files
##############################
bin/
gen/

##############################
# Local configuration file
##############################
/.settings/
/bin/
/gen/
/libs/
/project.properties
/.classpath
/.project
/lint.xml
/proguard-project.txt

# Android Studio
*.gradle
.idea/
*.iml
build/
gradle*
local.properties

# OSX garbage
.DS_Store
##############################
# Eclipse project files
##############################
Expand All @@ -58,4 +35,11 @@ proguard/
*.iml
*.ipr
*.iws
.idea/
.idea/

##############################
# Gradle build files
##############################
*.gradle
build/
gradle*
47 changes: 0 additions & 47 deletions build.gradle

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
package com.smartdevicelink.api;

import android.os.Bundle;
import android.util.Log;

import com.smartdevicelink.api.interfaces.SdlContext;

import java.util.Stack;

abstract class ActivityStateTransition {

private static final String TAG = ActivityStateTransition.class.getSimpleName();

ActivityStateTransition(){

}

ActivityStateTransition connect(SdlActivityManager sam){
return this;
}

ActivityStateTransition disconnect(SdlActivityManager sam){
return this;
}

ActivityStateTransition launchApp(SdlActivityManager sam, SdlContext sdlContext,
Class<? extends SdlActivity> main){
return this;
}

ActivityStateTransition resumeApp(SdlActivityManager sam, SdlContext sdlContext, Bundle resumeState){
return this;
}

ActivityStateTransition background(SdlActivityManager sam){
return this;
}

ActivityStateTransition foreground(SdlActivityManager sam){
return this;
}

ActivityStateTransition exit(SdlActivityManager sam){
return this;
}

ActivityStateTransition back(SdlActivityManager sam){
return this;
}

ActivityStateTransition startActivity(SdlActivityManager sam, SdlContext SdlContext,
Class<? extends SdlActivity> activity, Bundle bundle, int flags){
return this;
}

ActivityStateTransition finish(SdlActivityManager sam){
return this;
}

protected boolean instantiateActivity(SdlActivityManager sam, SdlContext sdlContext,
Class<? extends SdlActivity> activity, Bundle bundle, int flags){

Stack<SdlActivity> backStack = sam.getBackStack();

switch (flags){
case SdlActivity.FLAG_CLEAR_HISTORY:
clearHistory(backStack);
if(!backStack.empty() && backStack.peek().getClass() == activity){
startTopActivity(backStack, "");
return true;
}
break;
case SdlActivity.FLAG_CLEAR_TOP:
SdlActivity newTop = getInstanceFromStack(backStack, activity);
if(newTop != null){
String currentTemplate = clearTop(backStack, newTop);
startTopActivity(backStack, currentTemplate);
return true;
}
break;
case SdlActivity.FLAG_PULL_TO_TOP:
SdlActivity instanceFromStack = getInstanceFromStack(backStack, activity);
if(instanceFromStack != null){
if(instanceFromStack != backStack.peek()) {
String currentTemplate = stopTopActivity(backStack);
backStack.remove(instanceFromStack);
backStack.push(instanceFromStack);
startTopActivity(backStack, currentTemplate);
}
return true;
}
break;
default:
break;
}

try {
String currentTemplate = "";
SdlActivity newActivity = activity.newInstance();
newActivity.initialize(sdlContext);

if(!backStack.empty()) {
currentTemplate = stopTopActivity(backStack);
}

backStack.push(newActivity);
createTopActivity(backStack, bundle);
startTopActivity(backStack, currentTemplate);
return true;
} catch (InstantiationException e) {
Log.e(TAG, "Unable to instantiate " + activity.getSimpleName(), e);
return false;
} catch (IllegalAccessException e) {
Log.e(TAG, "Unable to access constructor for " + activity.getSimpleName(), e);
return false;
}
}

protected SdlActivity getInstanceFromStack(Stack<SdlActivity> backStack, Class<? extends SdlActivity> activity){
if(!backStack.empty()) {
for (SdlActivity act : backStack) {
if (act.getClass() == activity) return act;
}
}
return null;
}

protected String clearTop(Stack<SdlActivity> backStack, SdlActivity activity){
String currentTemplate = "";
while(!backStack.empty() && backStack.peek() != activity){
currentTemplate = destroyTopActivity(backStack);
}
return currentTemplate;
}

protected void clearHistory(Stack<SdlActivity> backStack){
while(backStack.size() > 1){
destroyTopActivity(backStack);
}
}

protected void createTopActivity(Stack<SdlActivity> backStack, Bundle bundle) {
if (backStack.empty()) return;

SdlActivity activity = backStack.peek();
if (activity != null) {
SdlActivity.SdlActivityState activityState = activity.getActivityState();
if (activityState == SdlActivity.SdlActivityState.PRE_CREATE) {
activity.performCreate(bundle);
}
}
}

protected void startTopActivity(Stack<SdlActivity> backStack, String currentTemplate){
if(backStack.empty()) return;

SdlActivity activity = backStack.peek();
if(activity != null){
SdlActivity.SdlActivityState activityState = activity.getActivityState();
if(activityState == SdlActivity.SdlActivityState.STOPPED){
activity.performRestart();
}

activityState = activity.getActivityState();
if(activityState == SdlActivity.SdlActivityState.POST_CREATE){
activity.performStart(currentTemplate);
}
}
}

protected void foregroundTopActivity(Stack<SdlActivity> backStack){
if(backStack.empty()) return;

SdlActivity activity = backStack.peek();

if(activity != null && activity.getActivityState() == SdlActivity.SdlActivityState.BACKGROUND) {
activity.performForeground();
}
}

protected void backgroundTopActivity(Stack<SdlActivity> backStack){
if(backStack.empty()) return;

SdlActivity activity = backStack.peek();
if(activity != null && activity.getActivityState() == SdlActivity.SdlActivityState.FOREGROUND) {
activity.performBackground();
}
}

protected String stopTopActivity(Stack<SdlActivity> backStack){
String currentTemplate = "";
if(backStack.empty()) return currentTemplate;

backgroundTopActivity(backStack);

SdlActivity activity = backStack.peek();
if(activity != null && activity.getActivityState() == SdlActivity.SdlActivityState.BACKGROUND) {
currentTemplate = activity.performStop();
}
return currentTemplate;
}

protected String destroyTopActivity(Stack<SdlActivity> backStack){
String currentTemplate = "";
if(backStack.empty()) return currentTemplate;

backStack.peek().setIsFinishing(true);

currentTemplate = stopTopActivity(backStack);

SdlActivity activity = backStack.pop();
if(activity != null) {
activity.performDestroy();
}
return currentTemplate;
}

protected String clearBackStack(Stack<SdlActivity> backStack){
String currentTemplate = "";
clearHistory(backStack);
if(!backStack.empty()) {
currentTemplate = destroyTopActivity(backStack);
}
return currentTemplate;
}

protected void navigateBack(Stack<SdlActivity> backStack){
Log.d(TAG, "Navigating back with stack size: " + backStack.size());
if(backStack.size() > 1){
SdlActivity topActivity = backStack.peek();
boolean isBackHandled = topActivity.performBackNavigation();
if(!isBackHandled){
String currentTemplate = destroyTopActivity(backStack);
startTopActivity(backStack, currentTemplate);
}
}
}

protected void finishActivity(Stack<SdlActivity> backStack){
if(backStack.empty()) return;

SdlActivity topActivity = backStack.peek();
if(!topActivity.isFinishing()){
SdlActivity.SdlActivityState targetState = topActivity.getActivityState();
Log.d(TAG, "State was: " + targetState.name());
String currentTemplate = destroyTopActivity(backStack);
if(targetState == SdlActivity.SdlActivityState.FOREGROUND ||
targetState == SdlActivity.SdlActivityState.BACKGROUND){
startTopActivity(backStack, currentTemplate);
}
if(targetState == SdlActivity.SdlActivityState.FOREGROUND){
foregroundTopActivity(backStack);
}
} else {
Log.w(TAG, "Finish called on SdlActivity that is already finishing.\n" +
"SdlActivity class: " + topActivity.getClass().getCanonicalName());
}
}

}
Loading