karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Address comments.

Browse Source
This commit is contained in:
Sandor Dornbush
2011-02-23 09:50:31 -08:00
parent 35aa51d6a9
commit 01c1a37fa2
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/services/FroyoStatusAnnouncerTask.java
+11 -4
View File
@@ -38,12 +38,17 @@ public class FroyoStatusAnnouncerTask
implements OnUtteranceCompletedListener, OnAudioFocusChangeListener { implements OnUtteranceCompletedListener, OnAudioFocusChangeListener {
private AudioManager audioManager; private AudioManager audioManager;
private final static HashMap<String, String> SPEACH_PARAMS = new HashMap<String, String>();
static {
SPEACH_PARAMS.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "not_used");
}
public FroyoStatusAnnouncerTask(Context context) { public FroyoStatusAnnouncerTask(Context context) {
super(context); super(context);
audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
} }
@Override
protected void onTtsInit(int status) { protected void onTtsInit(int status) {
super.onTtsInit(status); super.onTtsInit(status);
if (status == TextToSpeech.SUCCESS) { if (status == TextToSpeech.SUCCESS) {
@@ -51,14 +56,16 @@ public class FroyoStatusAnnouncerTask
} }
} }
@Override
protected void speakAnnouncment(String announcement) { protected void speakAnnouncment(String announcement) {
audioManager.requestAudioFocus(this, int result = audioManager.requestAudioFocus(this,
TextToSpeech.Engine.DEFAULT_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK); TextToSpeech.Engine.DEFAULT_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
Log.w(TAG, "FroyoStatusAnnouncerTask: Request audio focus failed.");
}
// We don't care about the id. // We don't care about the id.
// It is supplied here to force onUtteranceCompleted to be called. // It is supplied here to force onUtteranceCompleted to be called.
HashMap<String, String> params = new HashMap<String, String>(); tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, SPEACH_PARAMS);
params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "not_used");
tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, params);
} }
@Override @Override
MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerFactory.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class StatusAnnouncerFactory {
*/ */
public PeriodicTask create(Context context) { public PeriodicTask create(Context context) {
if (hasTts) { if (hasTts) {
if (ApiFeatures.getInstance().supportsAudioFocus()) { if (ApiFeatures.getInstance().isAudioFocusSupported()) {
return new FroyoStatusAnnouncerTask(context); return new FroyoStatusAnnouncerTask(context);
} else { } else {
return new StatusAnnouncerTask(context); return new StatusAnnouncerTask(context);
MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class ApiFeatures {
return getApiLevel() >= 9; return getApiLevel() >= 9;
} }
public boolean supportsAudioFocus() { public boolean isAudioFocusSupported() {
return getApiLevel() >= 8; return getApiLevel() >= 8;
} }