diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-09-01 23:42:43 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-09-01 23:42:43 -0700 |
| commit | 5bb7a64fe255ce12badf94e9236a7a8d26ef3488 (patch) | |
| tree | 74f35b4daed89b6674265f9c1cee6a958d9ed82c /java/src | |
| parent | 66a5884ad8df544f1c462148e763b29c7202f7b8 (diff) | |
| parent | ad56a9ac51a4dfb330b6a5f7ade78bd426b6716e (diff) | |
| download | latinime-5bb7a64fe255ce12badf94e9236a7a8d26ef3488.tar.gz latinime-5bb7a64fe255ce12badf94e9236a7a8d26ef3488.tar.xz latinime-5bb7a64fe255ce12badf94e9236a7a8d26ef3488.zip | |
Merge "Fix an NPE in settings"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index c42f0564c..e99bb7016 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -431,8 +431,10 @@ public class Settings extends InputMethodSettingsActivity final boolean showBigramSuggestionsOption = res.getBoolean( R.bool.config_enable_bigram_suggestions_option); if (!showBigramSuggestionsOption) { - textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_SUGGESTIONS)); - textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_PREDICTIONS)); + textCorrectionGroup.removePreference(mBigramSuggestion); + if (null != mBigramPrediction) { + textCorrectionGroup.removePreference(mBigramPrediction); + } } final boolean showUsabilityModeStudyOption = res.getBoolean( |