diff options
| author | Justin Ho <justinho@google.com> | 2012-01-20 14:42:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-20 14:42:33 -0800 |
| commit | 1fea43224ce3b84e248d9e49b8597fe58351db65 (patch) | |
| tree | 7e4515a52086b8671a378e95e906864e1574c6af /src | |
| parent | cf3f7abbeb9a31e73ef41b3f6512ebb095ac9e90 (diff) | |
| parent | 43c9dcc18e4e1137c59b847eadde7ae27302b08f (diff) | |
| download | packages_apps_settings-1fea43224ce3b84e248d9e49b8597fe58351db65.zip packages_apps_settings-1fea43224ce3b84e248d9e49b8597fe58351db65.tar.gz packages_apps_settings-1fea43224ce3b84e248d9e49b8597fe58351db65.tar.bz2 | |
am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
* commit '43c9dcc18e4e1137c59b847eadde7ae27302b08f':
Fix a pseudo race condition in TtsEngineSettingsFragment.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/tts/TtsEnginePreference.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java index b98a239..196882f 100644 --- a/src/com/android/settings/tts/TtsEnginePreference.java +++ b/src/com/android/settings/tts/TtsEnginePreference.java @@ -155,12 +155,21 @@ public class TtsEnginePreference extends Preference { } }); + if (mVoiceCheckData != null) { + mSettingsIcon.setEnabled(mRadioButton.isChecked()); + } + return view; } public void setVoiceDataDetails(Intent data) { mVoiceCheckData = data; - mSettingsIcon.setEnabled(mRadioButton.isChecked()); + // This might end up running before getView aboive, in which + // case mSettingsIcon && mRadioButton will be null. In this case + // getView will set the right values. + if (mSettingsIcon != null && mRadioButton != null) { + mSettingsIcon.setEnabled(mRadioButton.isChecked()); + } } private void onRadioButtonClicked(CompoundButton buttonView, boolean isChecked) { |