diff options
| author | Yohei Yukawa <yukawa@google.com> | 2015-06-27 21:40:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-27 21:40:53 +0000 |
| commit | 473440d79b1b93fac06cba220f70181492855763 (patch) | |
| tree | 87d0e4c0e649588cd2661d84079cf4c53ca63922 | |
| parent | 18ae8512b9357907f0411013aec46209aa40a384 (diff) | |
| parent | b1570d285aeff6338bb39155c0facba78fe6f385 (diff) | |
| download | packages_apps_Settings-473440d79b1b93fac06cba220f70181492855763.zip packages_apps_Settings-473440d79b1b93fac06cba220f70181492855763.tar.gz packages_apps_Settings-473440d79b1b93fac06cba220f70181492855763.tar.bz2 | |
Merge "Dont crash if there is no spellchecker" into mnc-dev
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 93ece66..e8ef5ef 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -254,8 +254,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment if (spellChecker != null) { final TextServicesManager tsm = (TextServicesManager) getSystemService( Context.TEXT_SERVICES_MANAGER_SERVICE); - if (tsm.isSpellCheckerEnabled()) { - final SpellCheckerInfo sci = tsm.getCurrentSpellChecker(); + final SpellCheckerInfo sci = tsm.getCurrentSpellChecker(); + spellChecker.setEnabled(sci != null); + if (tsm.isSpellCheckerEnabled() && sci != null) { spellChecker.setSummary(sci.loadLabel(getPackageManager())); } else { spellChecker.setSummary(R.string.switch_off_text); |