make default overlay for "show correction suggestion"stable/cm-12.0-YNG3C

Change-Id: I0d403021e2315ab0178b9aa7a8f5e4fa7f3f24b7

4 files changed, 15 insertions, 4 deletions

diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 40760f686..41324ec59 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -91,4 +91,7 @@
     <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
     <fraction name="config_emoji_keyboard_key_letter_size">68%p</fraction>
     <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>
diff --git a/java/res/xml/prefs_screen_correction.xml b/java/res/xml/prefs_screen_correction.xml
index 43f3fb931..94048cd5f 100644
--- a/java/res/xml/prefs_screen_correction.xml
+++ b/java/res/xml/prefs_screen_correction.xml
@@ -53,7 +53,6 @@
         android:key="show_suggestions"
         android:summary="@string/prefs_show_suggestions_summary"
         android:title="@string/prefs_show_suggestions"
-        android:defaultValue="true"
         android:persistent="true" />
     <CheckBoxPreference
         android:key="pref_key_use_personalized_dicts"
diff --git a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java
index ec29a7eb2..ebd21e7fb 100644
--- a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java
@@ -24,6 +24,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.SwitchPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 
@@ -80,6 +81,13 @@ public final class CorrectionSettingsFragment extends SubScreenFragment {
         if (ri == null) {
             overwriteUserDictionaryPreference(editPersonalDictionary);
         }
+
+        final SwitchPreference suggestionsEnabledPreference = (SwitchPreference) findPreference(
+                Settings.PREF_SHOW_SUGGESTIONS);
+        if (suggestionsEnabledPreference != null) {
+            suggestionsEnabledPreference.setChecked(
+                    Settings.getInstance().getCurrent().isSuggestionsEnabledPerUserSettings());
+        }
     }
 
     @Override
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
index eef8d532d..6b6978ed5 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
@@ -169,7 +169,7 @@ public final class SettingsValues {
         mPhraseGestureEnabled = Settings.readPhraseGestureEnabled(prefs, res);
         mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled
                 && !mInputAttributes.mInputTypeNoAutoCorrect;
-        mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs);
+        mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs, res);
         AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(
                 prefs, mAdditionalFeaturesSettingValues);
         mTextHighlightColorForAddToDictionaryIndicator = res.getColor(
@@ -283,7 +283,7 @@ public final class SettingsValues {
 
     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)) {
             final boolean alwaysHide = SUGGESTIONS_VISIBILITY_HIDE_VALUE_OBSOLETE.equals(
                     prefs.getString(Settings.PREF_SHOW_SUGGESTIONS_SETTING_OBSOLETE, null));
@@ -292,7 +292,8 @@ public final class SettingsValues {
                     .putBoolean(Settings.PREF_SHOW_SUGGESTIONS, !alwaysHide)
                     .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,