PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug #2577984 - Settings app was trying to access the TTS

Browse Source 
before the TTS was ready.

Change-Id: Ic8127f12a2608982fb35e126c7522cf6747b93ac
This commit is contained in:
Charles Chen
2010-04-07 14:26:31 -07:00
parent 473111bcfc
commit cf31e652d6
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/TextToSpeechSettings.java
View File

@@ -99,6 +99,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
private boolean mVoicesMissing = false; private boolean mVoicesMissing = false;
private TextToSpeech mTts = null; private TextToSpeech mTts = null;
private boolean mTtsStarted = false;
/** /**
* Request code (arbitrary value) for voice data check through * Request code (arbitrary value) for voice data check through
@@ -120,8 +121,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM); setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
mEnableDemo = false; mEnableDemo = false;
initClickers(); mTtsStarted = false;
initDefaultSettings();
mTts = new TextToSpeech(this, this); mTts = new TextToSpeech(this, this);
} }
@@ -130,6 +130,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
@Override @Override
protected void onStart() { protected void onStart() {
super.onStart(); super.onStart();
if (mTtsStarted){
// whenever we return to this screen, we don't know the state of the // whenever we return to this screen, we don't know the state of the
// system, so we have to recheck that we can play the demo, or it must be disabled. // system, so we have to recheck that we can play the demo, or it must be disabled.
// TODO make the TTS service listen to "changes in the system", i.e. sd card un/mount // TODO make the TTS service listen to "changes in the system", i.e. sd card un/mount
@@ -137,6 +138,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
updateWidgetState(); updateWidgetState();
checkVoiceData(); checkVoiceData();
} }
}
@Override @Override
@@ -327,7 +329,6 @@ public class TextToSpeechSettings extends PreferenceActivity implements
*/ */
public void onInit(int status) { public void onInit(int status) {
if (status == TextToSpeech.SUCCESS) { if (status == TextToSpeech.SUCCESS) {
Log.v(TAG, "TTS engine for settings screen initialized.");
mEnableDemo = true; mEnableDemo = true;
if (mDefaultLanguage == null) { if (mDefaultLanguage == null) {
mDefaultLanguage = Locale.getDefault().getISO3Language(); mDefaultLanguage = Locale.getDefault().getISO3Language();
@@ -340,6 +341,12 @@ public class TextToSpeechSettings extends PreferenceActivity implements
} }
mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant)); mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
mTts.setSpeechRate((float)(mDefaultRate/100.0f)); mTts.setSpeechRate((float)(mDefaultRate/100.0f));
initDefaultSettings();
initClickers();
updateWidgetState();
checkVoiceData();
mTtsStarted = true;
Log.v(TAG, "TTS engine for settings screen initialized.");
} else { } else {
Log.v(TAG, "TTS engine for settings screen failed to initialize successfully."); Log.v(TAG, "TTS engine for settings screen failed to initialize successfully.");
mEnableDemo = false; mEnableDemo = false;