diff options
author | Julian Kast <julian@livio.com> | 2020-12-17 16:24:50 -0500 |
---|---|---|
committer | Julian Kast <julian@livio.com> | 2020-12-17 16:24:50 -0500 |
commit | e9fbcb8ef2a68535ed268b04e535a946dab17f36 (patch) | |
tree | 6865e1c0f819b8624af71c71c660dd990b7f4a07 | |
parent | 6bea79383c113c19fb7008447afd35f87925a4a2 (diff) | |
download | sdl_android-feature/0305_homogenize_TextFieldName.tar.gz |
Remove navigationTextfeature/0305_homogenize_TextFieldName
3 files changed, 1 insertions, 8 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 e27d4d680..9ffa0fb09 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 @@ -204,7 +204,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(), 35); + 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 b43044279..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 @@ -174,7 +174,6 @@ public class TextFieldNameTests extends TestCase { enumTestList.add(TextFieldName.phoneNumber); enumTestList.add(TextFieldName.timeToDestination); enumTestList.add(TextFieldName.turnText); - enumTestList.add(TextFieldName.navigationText); 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 f8498d8d6..01e258d4c 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 @@ -194,12 +194,6 @@ public enum TextFieldName { */
turnText,
/**
- * Navigation text for turnList parameter of UpdateTurnList
- *
- * @since SmartDeviceLink 7.1.0
- */
- navigationText,
- /**
* Optional title of the template that will be displayed
*
* @since SmartDeviceLink 6.0
|