diff options
| author | ShobhitAd <adlakhashobhit@gmail.com> | 2020-06-26 12:30:54 -0400 |
|---|---|---|
| committer | ShobhitAd <adlakhashobhit@gmail.com> | 2020-06-26 12:30:54 -0400 |
| commit | 4decda70693572a020bd5a58dc6b6ec10b4af1f3 (patch) | |
| tree | a37e56f0435efdd0232904ed0288a3a9ed570d10 | |
| parent | ec78ae4af448e0eb8caeed6ba57835fa3042844d (diff) | |
| download | sdl_core-4decda70693572a020bd5a58dc6b6ec10b4af1f3.tar.gz | |
Change default character set in hmi capabilities to UTF_8
| -rwxr-xr-x | src/appMain/hmi_capabilities.json | 56 | ||||
| -rw-r--r-- | src/components/application_manager/src/hmi_capabilities_impl.cc | 6 |
2 files changed, 34 insertions, 28 deletions
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json index 91ddaf6d6c..fbe9a9bb0a 100755 --- a/src/appMain/hmi_capabilities.json +++ b/src/appMain/hmi_capabilities.json @@ -10,169 +10,169 @@ "displayName": "GENERIC_DISPLAY", "textFields": [{ "name": "mainField1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mainField2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mainField3", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mainField4", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "statusBar", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mediaClock", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "mediaTrack", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "alertText1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "alertText2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "alertText3", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "scrollableMessageBody", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "initialInteractionText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "navigationText1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "navigationText2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "ETA", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "totalDistance", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "navigationText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "audioPassThruDisplayText1", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "audioPassThruDisplayText2", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "sliderHeader", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "sliderFooter", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "notificationText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "menuName", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "secondaryText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "tertiaryText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "timeToDestination", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "turnText", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 }, { "name": "menuTitle", - "characterSet": "TYPE2SET", + "characterSet": "UTF_8", "width": 500, "rows": 1 } diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index 6a0fbf78e3..e02acd55da 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -390,6 +390,12 @@ void InitCapabilities() { std::string("CID1SET"), hmi_apis::Common_CharacterSet::CID1SET)); character_set_enum.insert(std::make_pair( std::string("CID2SET"), hmi_apis::Common_CharacterSet::CID2SET)); + character_set_enum.insert(std::make_pair( + std::string("ASCII"), hmi_apis::Common_CharacterSet::ASCII)); + character_set_enum.insert(std::make_pair( + std::string("ISO_8859_1"), hmi_apis::Common_CharacterSet::ISO_8859_1)); + character_set_enum.insert(std::make_pair( + std::string("UTF_8"), hmi_apis::Common_CharacterSet::UTF_8)); video_streaming_protocol_enum.insert(std::make_pair( std::string("RAW"), hmi_apis::Common_VideoStreamingProtocol::RAW)); |