diff options
| author | JackLivio <jack@livio.io> | 2016-10-14 09:57:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 09:57:03 -0400 |
| commit | 5bf2c5500309d36b60987e74bdd4ed1610ecffde (patch) | |
| tree | b97f1f5b664805604333f29403267b33a5d9fab3 | |
| parent | e9b2f5b137814654e1963a9248c891546a9855d0 (diff) | |
| parent | 999f1ef647aaf748b37f9676fad86229a8fe934c (diff) | |
| download | sdl_core-5bf2c5500309d36b60987e74bdd4ed1610ecffde.tar.gz | |
Merge pull request #884 from smartdevicelink/hotfix/generic_display_type_enum
Add “SDL_GENERIC” Display Type Enum
4 files changed, 5 insertions, 1 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc index 7535984c16..73afc0b68c 100644 --- a/src/components/application_manager/src/hmi_capabilities.cc +++ b/src/components/application_manager/src/hmi_capabilities.cc @@ -196,7 +196,8 @@ const std::map<std::string, hmi_apis::Common_DisplayType::eType> {"MFD3", hmi_apis::Common_DisplayType::MFD3}, {"MFD4", hmi_apis::Common_DisplayType::MFD4}, {"MFD5", hmi_apis::Common_DisplayType::MFD5}, - {"GEN3_8_INCH", hmi_apis::Common_DisplayType::GEN3_8_INCH}}; + {"GEN3_8_INCH", hmi_apis::Common_DisplayType::GEN3_8_INCH}, + {"SDL_GENERIC", hmi_apis::Common_DisplayType::SDL_GENERIC}}; const std::map<std::string, hmi_apis::Common_CharacterSet::eType> character_set_enum = {{"TYPE2SET", hmi_apis::Common_CharacterSet::TYPE2SET}, diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index f778649b86..f24c8812b4 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -382,6 +382,7 @@ <description> 5 inch GEN1.1 display </description> </element> <element name="GEN3_8_INCH"/> + <element name="SDL_GENERIC" /> </enum> <enum name="ImageType"> diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml index 1bff09ef38..b3973c8b73 100644 --- a/src/components/interfaces/MOBILE_API.xml +++ b/src/components/interfaces/MOBILE_API.xml @@ -580,6 +580,7 @@ <element name="MFD4" />
<element name="MFD5" />
<element name="GEN3_8-INCH" internal_name="GEN3_8_INCH" />
+ <element name="SDL_GENERIC" />
</enum>
<enum name="TextFieldName">
diff --git a/src/components/utils/test/test_generator/MOBILE_API.xml b/src/components/utils/test/test_generator/MOBILE_API.xml index 01ea48dce9..fa93a910d4 100644 --- a/src/components/utils/test/test_generator/MOBILE_API.xml +++ b/src/components/utils/test/test_generator/MOBILE_API.xml @@ -584,6 +584,7 @@ <element name="MFD4" /> <element name="MFD5" /> <element name="GEN3_8-INCH" internal_name="GEN3_8_INCH" /> + <element name="SDL_GENERIC" /> </enum> <enum name="TextFieldName"> |