diff options
| author |   Chieu Nguyen <cvnguyen@google.com> | 2015-03-24 00:32:33 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 00:32:33 +0000 |
| commit | b1333cbc421cbcbf4cd2f4c2715c53b361f0ca36 (patch) | |
| tree | ed60a2c8d5280c371be56b5635b56e014a5fac00 /java/src | |
| parent | 66ef3268a00a878d9dd7d87b7991aa49ea84e540 (diff) | |
| parent | fac1f631b96c4ab852be950c03ef3d57faa86b28 (diff) | |
| download | latinime-b1333cbc421cbcbf4cd2f4c2715c53b361f0ca36.tar.gz latinime-b1333cbc421cbcbf4cd2f4c2715c53b361f0ca36.tar.xz latinime-b1333cbc421cbcbf4cd2f4c2715c53b361f0ca36.zip | |
am fac1f631: Merge "Reenable next-word suggestion if autocorrection reenabled."
* commit 'fac1f631b96c4ab852be950c03ef3d57faa86b28':
Reenable next-word suggestion if autocorrection reenabled.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java index f7c5f6760..32cc526c0 100644 --- a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java @@ -49,7 +49,7 @@ import java.util.TreeSet; */ public final class CorrectionSettingsFragment extends SubScreenFragment { private static final boolean DBG_USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS = false; - private static final boolean USE_INTERNAL_PERSONAL_DICTIONARY_SETTIGS = + private static final boolean USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS = DBG_USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS || Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2; @@ -74,7 +74,7 @@ public final class CorrectionSettingsFragment extends SubScreenFragment { final Preference editPersonalDictionary = findPreference(Settings.PREF_EDIT_PERSONAL_DICTIONARY); final Intent editPersonalDictionaryIntent = editPersonalDictionary.getIntent(); - final ResolveInfo ri = USE_INTERNAL_PERSONAL_DICTIONARY_SETTIGS ? null + final ResolveInfo ri = USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS ? null : pm.resolveActivity( editPersonalDictionaryIntent, PackageManager.MATCH_DEFAULT_ONLY); if (ri == null) { @@ -90,9 +90,7 @@ public final class CorrectionSettingsFragment extends SubScreenFragment { private void ensureConsistencyOfAutoCorrectionSettings() { final TwoStatePreference autoCorrectionPref = (TwoStatePreference) findPreference(Settings.PREF_AUTO_CORRECTION); - if (!autoCorrectionPref.isChecked()) { - setPreferenceEnabled(Settings.PREF_BIGRAM_PREDICTIONS, false); - } + setPreferenceEnabled(Settings.PREF_BIGRAM_PREDICTIONS, autoCorrectionPref.isChecked()); } private void overwriteUserDictionaryPreference(final Preference userDictionaryPreference) { |