diff options
| author | Julian Kast <Julian.kast@livio.io> | 2021-02-10 10:52:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 10:52:46 -0500 |
| commit | 43cc6eea40f495ca3f5091a2d64c03577db48e1f (patch) | |
| tree | dc96fe8e85b0ad5e413b6241c3781f4714a9d73b | |
| parent | 678fe7df9a8ebf3b08cad5a96a44a801d5fb5eb2 (diff) | |
| download | sdl_android-43cc6eea40f495ca3f5091a2d64c03577db48e1f.tar.gz | |
SDL-0305 Homogenize TextFieldName (#1585)
* Added timeToDestination, turnText and navigationText to enum TextFieldName
* Added enums to TextFieldNameTests
* Fix unit test for SystemCapabilityManager
* Remove navigationText
* Fixed Documentation to align with rpc spec changes
Co-authored-by: Julian Kast <julian@livio.com>
3 files changed, 15 insertions, 1 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java index 928b7bd09..3aba434c5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java @@ -205,7 +205,7 @@ public class SystemCapabilityManagerTests { @Test public void testNullDisplayCapabilitiesEnablesAllTextAndImageFields() { List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(null, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST); - assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getTextFields().size(), 32); + assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getTextFields().size(), 34); assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getImageFields().size(), 16); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java index 0eb05f848..dad5ea3e2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java @@ -172,6 +172,8 @@ public class TextFieldNameTests extends TestCase { enumTestList.add(TextFieldName.locationDescription); enumTestList.add(TextFieldName.addressLines); enumTestList.add(TextFieldName.phoneNumber); + enumTestList.add(TextFieldName.timeToDestination); + enumTestList.add(TextFieldName.turnText); enumTestList.add(TextFieldName.templateTitle); enumTestList.add(TextFieldName.subtleAlertText1); enumTestList.add(TextFieldName.subtleAlertText2); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java index 1c749cc7f..6b07a2f9b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java @@ -185,6 +185,18 @@ public enum TextFieldName { */
phoneNumber,
/**
+ * Optional time to destination field for ShowConstantTBT
+ *
+ * @since SmartDeviceLink 7.1.0
+ */
+ timeToDestination,
+ /**
+ * Turn text for turnList parameter of UpdateTurnList
+ *
+ * @since SmartDeviceLink 7.1.0
+ */
+ turnText,
+ /**
* Optional title of the template that will be displayed
*
* @since SmartDeviceLink 6.0
|