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

Commit 2828d9ed authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "[ML10.1] Adjust call for additional features"

parents 4cc9c8b5 8da20521

java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ public class AdditionalFeaturesSettingUtils { 
        // do nothing.

        // do nothing.

    }

    }





    public static void readAdditionalFeaturesPreferencesIntoArray(

    public static void readAdditionalFeaturesPreferencesIntoArray(final Context context,

            final SharedPreferences prefs, final int[] additionalFeaturesPreferences) {

            final SharedPreferences prefs, final int[] additionalFeaturesPreferences) {

        // do nothing.

        // do nothing.

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ public class SettingsValues { 
        mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled

        mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled

                && !mInputAttributes.mInputTypeNoAutoCorrect;

                && !mInputAttributes.mInputTypeNoAutoCorrect;

        mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs);

        mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs);

        AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(

        AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(context,

                prefs, mAdditionalFeaturesSettingValues);

                prefs, mAdditionalFeaturesSettingValues);

        mTextHighlightColorForAddToDictionaryIndicator = res.getColor(

        mTextHighlightColorForAddToDictionaryIndicator = res.getColor(

                R.color.text_decorator_add_to_dictionary_indicator_text_highlight_color);

                R.color.text_decorator_add_to_dictionary_indicator_text_highlight_color);