summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Melnik <AMelnik@luxoft.com>2014-09-17 10:37:02 +0300
committerAndriy Melnik <AMelnik@luxoft.com>2014-09-17 10:37:02 +0300
commit858550785d568c46a073dbbc3b95a50300ada738 (patch)
treea8831a497026c5a3d6d2a7ede1db889d8afc76d7
parent502ec4d4b8360d0991f2ad9be5dc0f6e81319968 (diff)
downloadsdl_core-858550785d568c46a073dbbc3b95a50300ada738.tar.gz
APPLINK-9287: HMI API enum equation to protocol version.
-rw-r--r--src/components/interfaces/HMI_API.xml20
-rw-r--r--src/components/interfaces/QT_HMI_API.xml31
2 files changed, 25 insertions, 26 deletions
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index 4ad1bfff27..72e29faa29 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -427,9 +427,6 @@
<element name="totalDistance">
<description> Total distance to destination for navigation</description>
</element>
- <element name="navigationText">
- <description>Navigation text for UpdateTurnList.</description>
- </element>
<element name="audioPassThruDisplayText1">
<description> First line of text for audio pass thru</description>
</element>
@@ -442,9 +439,6 @@
<element name="sliderFooter">
<description> Footer text for slider</description>
</element>
- <element name="notificationText">
- <description>Text of notification to be displayed on screen.</description>
- </element>
<element name="menuName">
<description> Primary text for Choice</description>
</element>
@@ -458,14 +452,17 @@
<description> Optional text to label an app menu button (for certain touchscreen platforms).</description>
</element>
<element name="timeToDestination"/>
- <!-- TO DO to be removed -->
+ <element name="navigationText">
+ <description>Navigation text for UpdateTurnList.</description>
+ </element>
+ <element name="notificationText">
+ <description>Text of notification to be displayed on screen.</description>
+ </element>
+ <!-- TO DO to be removed -->
<element name="turnText"/>
</enum>
<enum name="ImageFieldName">
- <element name="locationImage">
- <description>The optional image of a destination / location</description>
- </element>
<element name="softButtonImage">
<description>The image field for SoftButton</description>
</element>
@@ -499,6 +496,9 @@
<element name="showConstantTBTNextTurnIcon">
<description>The secondary image field for ShowConstantTBT</description>
</element>
+ <element name="locationImage">
+ <description>The optional image of a destination / location</description>
+ </element>
</enum>
<enum name="TextAlignment">
diff --git a/src/components/interfaces/QT_HMI_API.xml b/src/components/interfaces/QT_HMI_API.xml
index 3f6d08b69b..ff62fed7f7 100644
--- a/src/components/interfaces/QT_HMI_API.xml
+++ b/src/components/interfaces/QT_HMI_API.xml
@@ -347,12 +347,11 @@
<element name="STATIC"/>
<element name="DYNAMIC"/>
</enum>
-<enum name="ApplicationToNONEReason">
- <description>Describes the reasons of moving the app to NONE.</description>
- <element name="DRIVER_DISTRACTION_VIOLATION" />
- <element name="USER_EXIT" />
-</enum>
-
+ <enum name="ApplicationToNONEReason">
+ <description>Describes the reasons of moving the app to NONE.</description>
+ <element name="DRIVER_DISTRACTION_VIOLATION" />
+ <element name="USER_EXIT" />
+ </enum>
<enum name="TextFieldName">
<element name="mainField1">
<description>The first line of first set of main fields of the persistent display; applies to "Show"</description>
@@ -402,9 +401,6 @@
<element name="totalDistance">
<description> Total distance to destination for navigation</description>
</element>
- <element name="navigationText">
- <description>Navigation text for UpdateTurnList.</description>
- </element>
<element name="audioPassThruDisplayText1">
<description> First line of text for audio pass thru</description>
</element>
@@ -417,9 +413,6 @@
<element name="sliderFooter">
<description> Footer text for slider</description>
</element>
- <element name="notificationText">
- <description>Text of notification to be displayed on screen.</description>
- </element>
<element name="menuName">
<description> Primary text for Choice</description>
</element>
@@ -433,13 +426,16 @@
<description> Optional text to label an app menu button (for certain touchscreen platforms).</description>
</element>
<element name="timeToDestination"/>
- <!-- TO DO to be removed -->
+ <element name="navigationText">
+ <description>Navigation text for UpdateTurnList.</description>
+ </element>
+ <element name="notificationText">
+ <description>Text of notification to be displayed on screen.</description>
+ </element>
+ <!-- TO DO to be removed -->
<element name="turnText"/>
</enum>
<enum name="ImageFieldName">
- <element name="locationImage">
- <description>The optional image of a destination / location</description>
- </element>
<element name="softButtonImage">
<description>The image field for SoftButton</description>
</element>
@@ -473,6 +469,9 @@
<element name="showConstantTBTNextTurnIcon">
<description>The secondary image field for ShowConstantTBT</description>
</element>
+ <element name="locationImage">
+ <description>The optional image of a destination / location</description>
+ </element>
</enum>
<enum name="TextAlignment">
<description>The list of possible alignments, left, right, or centered</description>