diff options
| author | Alexander Kutsan <akutsan@luxoft.com> | 2018-04-06 11:36:54 +0300 |
|---|---|---|
| committer | Elvis Kuliiev <ekuliiev@luxoft.com> | 2018-05-25 20:05:12 +0300 |
| commit | 6829877a77d01eaaa8718e0960feea8ea7966895 (patch) | |
| tree | bf2e6106cabb5b0cd729146025c96d0e5301f55f | |
| parent | 7fdf6ada7dbe538283538aed93a27c40e8f7d52c (diff) | |
| download | sdl_core-6829877a77d01eaaa8718e0960feea8ea7966895.tar.gz | |
Setting app icon to application in case if it exist on file system
Implementation of proposal 0041-appicon-resumption.md
Technical task : https://github.com/smartdevicelink/sdl_core/issues/1456
Setup Icon to application if icon exist on file system
Implementation of proposal 0041-appicon-resumption.md
Technical task : https://github.com/smartdevicelink/sdl_core/issues/1456
| -rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 7 | ||||
| -rw-r--r-- | src/components/application_manager/src/commands/mobile/register_app_interface_request.cc | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 248b54fee5..3ead8fe65e 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -623,6 +623,13 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication( const std::string& bundle_id = app_info[strings::bundle_id].asString(); application->set_bundle_id(bundle_id); } + + const std::string app_icon_dir(settings_.app_icons_folder()); + const std::string full_icon_path(app_icon_dir + "/" + policy_app_id); + if (file_system::FileExists(full_icon_path)) { + application->set_app_icon_path(full_icon_path); + } + PutDriverDistractionMessageToPostponed(application); // Stops timer of saving data to resumption in order to diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc index 994e8f4995..d32afad00b 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc @@ -839,7 +839,9 @@ void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI( application[strings::app_name] = application_impl.name(); application[strings::app_id] = application_impl.app_id(); application[hmi_response::policy_app_id] = application_impl.policy_app_id(); - application[strings::icon] = application_impl.app_icon_path(); + if (file_system::FileExists(application_impl.app_icon_path())) { + application[strings::icon] = application_impl.app_icon_path(); + } const smart_objects::SmartObject* ngn_media_screen_name = application_impl.ngn_media_screen_name(); |