diff options
| author | Michael Dippold <michael.dippold@us.thalesgroup.com> | 2016-08-10 10:32:17 -0700 |
|---|---|---|
| committer | Michael Dippold <michael.dippold@us.thalesgroup.com> | 2016-08-15 20:12:19 +0000 |
| commit | d65fe883aaadc95a52dc929cb078320b14d5c4f0 (patch) | |
| tree | 44556ae410f7d5cdff03d48c2049c130640c7243 | |
| parent | 907b47360260538ee5fa7ff8aea9837709fad3e0 (diff) | |
Remove dependency on android-21 platform
Removing the dependency on API level 21 as the CI system currently
does not support it.
Change-Id: Ia66b4c65356a035918bdaf77841015dabde74ae9
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | src/plugins/tts/android/jar/jar.pri | 1 | ||||
| -rw-r--r-- | src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java | 23 |
2 files changed, 5 insertions, 19 deletions
diff --git a/src/plugins/tts/android/jar/jar.pri b/src/plugins/tts/android/jar/jar.pri index 4c14cec..0148470 100644 --- a/src/plugins/tts/android/jar/jar.pri +++ b/src/plugins/tts/android/jar/jar.pri @@ -2,7 +2,6 @@ load(qt_build_paths) CONFIG += java DESTDIR = $$MODULE_BASE_OUTDIR/jar -API_VERSION = android-21 PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/speech diff --git a/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java b/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java index 8770a1e..d6a6846 100644 --- a/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java +++ b/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java @@ -95,14 +95,6 @@ public class QtTextToSpeech } @Override - public void onError(String utteranceId, int errorCode) { - Log.w("UtteranceProgressListener", "onError"); - if (utteranceId.equals("UtteranceId")) { - notifyReady(mId); - } - } - - @Override public void onStart(String utteranceId) { Log.w("UtteranceProgressListener", "onStart"); if (utteranceId.equals("UtteranceId")) { @@ -144,16 +136,11 @@ public class QtTextToSpeech Log.w("QtTextToSpeech", text); int result = -1; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Bundle params = new Bundle(); - params.putFloat(TextToSpeech.Engine.KEY_PARAM_VOLUME, mVolume); - result = mTts.speak(text, TextToSpeech.QUEUE_FLUSH, params, "UtteranceId"); - } else { - HashMap<String, String> map = new HashMap<String, String>(); - map.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "UtteranceId"); - map.put(TextToSpeech.Engine.KEY_PARAM_VOLUME, Float.toString(mVolume)); - result = mTts.speak(text, TextToSpeech.QUEUE_FLUSH, map); - } + + HashMap<String, String> map = new HashMap<String, String>(); + map.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "UtteranceId"); + map.put(TextToSpeech.Engine.KEY_PARAM_VOLUME, Float.toString(mVolume)); + result = mTts.speak(text, TextToSpeech.QUEUE_FLUSH, map); Log.w("QtTextToSpeech", "RESULT: " + Integer.toString(result)); } |