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

Commit 460c63dd authored by Edward Wang's avatar Edward Wang
Browse files

make default overlay for "show correction suggestion" 

Change-Id: I0d403021e2315ab0178b9aa7a8f5e4fa7f3f24b7
(cherry picked from commit c5292bad)
parent 0be21a0c

java/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -91,4 +91,7 @@ 
    <fraction name="config_emoji_keyboard_row_height">33%p</fraction>

    <fraction name="config_emoji_keyboard_row_height">33%p</fraction>

    <fraction name="config_emoji_keyboard_key_letter_size">68%p</fraction>

    <fraction name="config_emoji_keyboard_key_letter_size">68%p</fraction>

    <integer name="config_emoji_keyboard_max_page_key_count">21</integer>

    <integer name="config_emoji_keyboard_max_page_key_count">21</integer>



    <!-- Display suggested words while typing  -->

    <bool name="config_show_suggestions_default">true</bool>

</resources>
 
</resources>

java/res/xml/prefs_screen_correction.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ 
        android:key="show_suggestions"

        android:key="show_suggestions"

        android:summary="@string/prefs_show_suggestions_summary"

        android:summary="@string/prefs_show_suggestions_summary"

        android:title="@string/prefs_show_suggestions"

        android:title="@string/prefs_show_suggestions"

        android:defaultValue="true"

        android:persistent="true" />

        android:persistent="true" />

    <CheckBoxPreference

    <CheckBoxPreference

        android:key="pref_key_use_personalized_dicts"

        android:key="pref_key_use_personalized_dicts"

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.os.Build;

import android.os.Build;

import android.os.Bundle;

import android.os.Bundle;

import android.preference.SwitchPreference;

import android.preference.ListPreference;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.Preference;
@@ -80,6 +81,13 @@ public final class CorrectionSettingsFragment extends SubScreenFragment { 
        if (ri == null) {

        if (ri == null) {

            overwriteUserDictionaryPreference(editPersonalDictionary);

            overwriteUserDictionaryPreference(editPersonalDictionary);

        }

        }



        final SwitchPreference suggestionsEnabledPreference = (SwitchPreference) findPreference(

                Settings.PREF_SHOW_SUGGESTIONS);

        if (suggestionsEnabledPreference != null) {

            suggestionsEnabledPreference.setChecked(

                    Settings.getInstance().getCurrent().isSuggestionsEnabledPerUserSettings());

        }

    }

    }





    @Override

    @Override

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ public final class SettingsValues { 
        mPhraseGestureEnabled = Settings.readPhraseGestureEnabled(prefs, res);

        mPhraseGestureEnabled = Settings.readPhraseGestureEnabled(prefs, res);

        mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled

        mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled

                && !mInputAttributes.mInputTypeNoAutoCorrect;

                && !mInputAttributes.mInputTypeNoAutoCorrect;

        mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs);

        mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs, res);

        AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(

        AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(

                prefs, mAdditionalFeaturesSettingValues);

                prefs, mAdditionalFeaturesSettingValues);

        mTextHighlightColorForAddToDictionaryIndicator = res.getColor(

        mTextHighlightColorForAddToDictionaryIndicator = res.getColor(
@@ -283,7 +283,7 @@ public final class SettingsValues { 




    private static final String SUGGESTIONS_VISIBILITY_HIDE_VALUE_OBSOLETE = "2";

    private static final String SUGGESTIONS_VISIBILITY_HIDE_VALUE_OBSOLETE = "2";





    private static boolean readSuggestionsEnabled(final SharedPreferences prefs) {

    private static boolean readSuggestionsEnabled(final SharedPreferences prefs, Resources res) {

        if (prefs.contains(Settings.PREF_SHOW_SUGGESTIONS_SETTING_OBSOLETE)) {

        if (prefs.contains(Settings.PREF_SHOW_SUGGESTIONS_SETTING_OBSOLETE)) {

            final boolean alwaysHide = SUGGESTIONS_VISIBILITY_HIDE_VALUE_OBSOLETE.equals(

            final boolean alwaysHide = SUGGESTIONS_VISIBILITY_HIDE_VALUE_OBSOLETE.equals(

                    prefs.getString(Settings.PREF_SHOW_SUGGESTIONS_SETTING_OBSOLETE, null));

                    prefs.getString(Settings.PREF_SHOW_SUGGESTIONS_SETTING_OBSOLETE, null));
@@ -292,7 +292,8 @@ public final class SettingsValues { 
                    .putBoolean(Settings.PREF_SHOW_SUGGESTIONS, !alwaysHide)

                    .putBoolean(Settings.PREF_SHOW_SUGGESTIONS, !alwaysHide)

                    .apply();

                    .apply();

        }

        }

        return prefs.getBoolean(Settings.PREF_SHOW_SUGGESTIONS, true);

        return prefs.getBoolean(Settings.PREF_SHOW_SUGGESTIONS, res.getBoolean(

                                R.bool.config_show_suggestions_default));

    }

    }





    private static boolean readBigramPredictionEnabled(final SharedPreferences prefs,

    private static boolean readBigramPredictionEnabled(final SharedPreferences prefs,