diff options
author | JackLivio <jack@livio.io> | 2018-05-21 15:40:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-21 15:40:31 -0400 |
commit | 83f9b0c4c0bbf0dc58ede80a059a681885e18a63 (patch) | |
tree | 5b04052beac0e5216e0d41637907c6f71b73388d /src/components | |
parent | 65c1e7eb77fa949cce9c07f229e2cf747f297e14 (diff) | |
parent | 1e9d9b20d7dd1599b21b3bebe75d993165745be0 (diff) | |
download | sdl_core-83f9b0c4c0bbf0dc58ede80a059a681885e18a63.tar.gz |
Merge pull request #2156 from smartdevicelink/feature/imagefieldname_for_secondaryimage
Add secondaryGraphic to ImageFieldName enum
Diffstat (limited to 'src/components')
4 files changed, 21 insertions, 3 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index e39b728155..278e4761db 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -282,6 +282,9 @@ void InitCapabilities() { image_field_name_enum.insert(std::make_pair( std::string("graphic"), hmi_apis::Common_ImageFieldName::graphic)); image_field_name_enum.insert( + std::make_pair(std::string("secondaryGraphic"), + hmi_apis::Common_ImageFieldName::secondaryGraphic)); + image_field_name_enum.insert( std::make_pair(std::string("showConstantTBTIcon"), hmi_apis::Common_ImageFieldName::showConstantTBTIcon)); image_field_name_enum.insert(std::make_pair( diff --git a/src/components/application_manager/test/hmi_capabilities.json b/src/components/application_manager/test/hmi_capabilities.json index 9db6ee78ae..0efcc688bc 100644 --- a/src/components/application_manager/test/hmi_capabilities.json +++ b/src/components/application_manager/test/hmi_capabilities.json @@ -263,7 +263,15 @@ }, { "name": "graphic", - "imageTypeSupported": [], + "imageTypeSupported": [], + "imageResolution": { + "resolutionWidth": 35, + "resolutionHeight": 35 + } + }, + { + "name": "secondaryGraphic", + "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index ab3933fc0f..a7302a31cf 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -624,7 +624,10 @@ <description>The image field for the app icon (set by setAppIcon)</description> </element> <element name="graphic"> - <description>The image field for Show</description> + <description>The primary image field for Show</description> + </element> + <element name="secondaryGraphic"> + <description>The secondary image field for Show</description> </element> <element name="showConstantTBTIcon"> <description>The primary image field for ShowConstantTBT</description> diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml index a1c64aecda..d032247c85 100644 --- a/src/components/interfaces/MOBILE_API.xml +++ b/src/components/interfaces/MOBILE_API.xml @@ -781,7 +781,11 @@ </element> <element name="graphic"> - <description>The image field for Show</description> + <description>The primary image field for Show</description> + </element> + + <element name="secondaryGraphic"> + <description>The secondary image field for Show</description> </element> <element name="showConstantTBTIcon"> |