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

am 18cd4093: Merge change 24440 into eclair

Browse Source 
Merge commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f' into eclair-plus-aosp

* commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f':
  Fix bug 2078454 where clicking on Settings in the Home menu would
This commit is contained in:
Jean-Michel Trivi
2009-09-09 15:42:27 -07:00
committed by Android Git Automerger
parent c93110409c 18cd409301
commit 23c24f8791
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,11 +90,6 @@ public class TextToSpeechSettings extends PreferenceActivity implements
* startActivityForResult. * startActivityForResult.
*/ */
private static final int VOICE_DATA_INTEGRITY_CHECK = 1977; private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
/**
* Request code (arbitrary value) for voice data installation through
* startActivityForResult.
*/
private static final int VOICE_DATA_INSTALLATION = 1980;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -218,13 +213,14 @@ public class TextToSpeechSettings extends PreferenceActivity implements
PackageManager pm = getPackageManager(); PackageManager pm = getPackageManager();
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA); intent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0); List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
// query only the package that matches that of the default engine // query only the package that matches that of the default engine
for (int i = 0; i < resolveInfos.size(); i++) { for (int i = 0; i < resolveInfos.size(); i++) {
ActivityInfo currentActivityInfo = resolveInfos.get(i).activityInfo; ActivityInfo currentActivityInfo = resolveInfos.get(i).activityInfo;
if (mDefaultEng.equals(currentActivityInfo.packageName)) { if (mDefaultEng.equals(currentActivityInfo.packageName)) {
intent.setClassName(mDefaultEng, currentActivityInfo.name); intent.setClassName(mDefaultEng, currentActivityInfo.name);
this.startActivityForResult(intent, VOICE_DATA_INSTALLATION); this.startActivity(intent);
} }
} }
} }