am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1

* commit '43c9dcc18e4e1137c59b847eadde7ae27302b08f':
  Fix a pseudo race condition in TtsEngineSettingsFragment.
This commit is contained in:
Justin Ho
2012-01-20 14:42:33 -08:00
committed by Android Git Automerger

View File

@@ -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) {