nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am fac1f631: Merge "Reenable next-word suggestion if autocorrection reenabled." 

* commit 'fac1f631b96c4ab852be950c03ef3d57faa86b28':
  Reenable next-word suggestion if autocorrection reenabled.
main
Chieu Nguyen 2015-03-24 00:32:33 +00:00 committed by Android Git Automerger
parent 66ef3268a0 fac1f631b9
commit b1333cbc42
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java
View File

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