diff options
author | Austin Kirk <askirk@umich.edu> | 2017-06-19 14:55:42 -0400 |
---|---|---|
committer | Austin Kirk <askirk@umich.edu> | 2017-06-19 14:55:42 -0400 |
commit | 63459fad84d226a34d2f8214361da0f92c662d33 (patch) | |
tree | 239f2b437b521639a04b2b0dbc9ad2a214031809 | |
parent | 97c3b2a804427196663452b1d140e7594f6fdb77 (diff) | |
download | sdl_android-63459fad84d226a34d2f8214361da0f92c662d33.tar.gz |
Adding FILE enum to SpeechCapabilities
- And added associate line in unit test
2 files changed, 7 insertions, 1 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java index 2ed1b4a77..364f7c896 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java @@ -76,6 +76,7 @@ public class SpeechCapabilitiesTests extends TestCase { enumTestList.add(SpeechCapabilities.LHPLUS_PHONEMES); enumTestList.add(SpeechCapabilities.PRE_RECORDED); enumTestList.add(SpeechCapabilities.SILENCE); + enumTestList.add(SpeechCapabilities.FILE); assertTrue("Enum value list does not match enum class list", enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java index 2b5d17740..7d8330d0a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java @@ -30,7 +30,12 @@ public enum SpeechCapabilities { * The SDL platform can play the prerecorded sound of 1 second of silence (i.e. no sound at all).
*/
- SILENCE;
+ SILENCE,
+
+ /**
+ * The SDL platform can play audio files in conjunction with/without TTS text.
+ */
+ FILE;
/**
* Convert String to SpeechCapabilities
* @param value String
|