Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fac1f631 authored by Chieu Nguyen's avatar Chieu Nguyen Committed by Android (Google) Code Review
Browse files

Merge "Reenable next-word suggestion if autocorrection reenabled."

parents c4f71f6b 1eedcfb2

java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java

+3 −5
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ import java.util.TreeSet; 
 */

 */

public final class CorrectionSettingsFragment extends SubScreenFragment {

public final class CorrectionSettingsFragment extends SubScreenFragment {

    private static final boolean DBG_USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS = false;

    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

            DBG_USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS

            || Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2;

            || Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2;
@@ -74,7 +74,7 @@ public final class CorrectionSettingsFragment extends SubScreenFragment { 
        final Preference editPersonalDictionary =

        final Preference editPersonalDictionary =

                findPreference(Settings.PREF_EDIT_PERSONAL_DICTIONARY);

                findPreference(Settings.PREF_EDIT_PERSONAL_DICTIONARY);

        final Intent editPersonalDictionaryIntent = editPersonalDictionary.getIntent();

        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(

                : pm.resolveActivity(

                        editPersonalDictionaryIntent, PackageManager.MATCH_DEFAULT_ONLY);

                        editPersonalDictionaryIntent, PackageManager.MATCH_DEFAULT_ONLY);

        if (ri == null) {

        if (ri == null) {
@@ -90,9 +90,7 @@ public final class CorrectionSettingsFragment extends SubScreenFragment { 
    private void ensureConsistencyOfAutoCorrectionSettings() {

    private void ensureConsistencyOfAutoCorrectionSettings() {

        final TwoStatePreference autoCorrectionPref = (TwoStatePreference)

        final TwoStatePreference autoCorrectionPref = (TwoStatePreference)

                findPreference(Settings.PREF_AUTO_CORRECTION);

                findPreference(Settings.PREF_AUTO_CORRECTION);

        if (!autoCorrectionPref.isChecked()) {

        setPreferenceEnabled(Settings.PREF_BIGRAM_PREDICTIONS, autoCorrectionPref.isChecked());

            setPreferenceEnabled(Settings.PREF_BIGRAM_PREDICTIONS, false);

        }

    }

    }





    private void overwriteUserDictionaryPreference(final Preference userDictionaryPreference) {

    private void overwriteUserDictionaryPreference(final Preference userDictionaryPreference) {