Merge "Fix an NPE in settings"

main
Jean Chalard 2011-09-01 23:42:43 -07:00 committed by Android (Google) Code Review
commit 5bb7a64fe2
1 changed files with 4 additions and 2 deletions

View File

@ -431,8 +431,10 @@ public class Settings extends InputMethodSettingsActivity
final boolean showBigramSuggestionsOption = res.getBoolean( final boolean showBigramSuggestionsOption = res.getBoolean(
R.bool.config_enable_bigram_suggestions_option); R.bool.config_enable_bigram_suggestions_option);
if (!showBigramSuggestionsOption) { if (!showBigramSuggestionsOption) {
textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_SUGGESTIONS)); textCorrectionGroup.removePreference(mBigramSuggestion);
textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_PREDICTIONS)); if (null != mBigramPrediction) {
textCorrectionGroup.removePreference(mBigramPrediction);
}
} }
final boolean showUsabilityModeStudyOption = res.getBoolean( final boolean showUsabilityModeStudyOption = res.getBoolean(