diff options
| author | Edward Wang <ewang@cyngn.com> | 2015-04-08 13:16:02 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-12-10 01:32:15 +0200 |
| commit | 7b221605a9aadfe3aadba816396648d3bd3017a8 (patch) | |
| tree | 87807c636aa8a74f1ac293ebf5258bc684ccf246 /java/src | |
| parent | 423bea86a7ad38e14104691da6ae0286fe7c0929 (diff) | |
| download | android_packages_inputmethods_LatinIME-7b221605a9aadfe3aadba816396648d3bd3017a8.tar.gz android_packages_inputmethods_LatinIME-7b221605a9aadfe3aadba816396648d3bd3017a8.tar.bz2 android_packages_inputmethods_LatinIME-7b221605a9aadfe3aadba816396648d3bd3017a8.zip | |
make default overlay for "show correction suggestion"
Change-Id: I0d403021e2315ab0178b9aa7a8f5e4fa7f3f24b7
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java | 7 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java index dfe899ece..f3e7f6084 100644 --- a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java @@ -90,6 +90,13 @@ public final class CorrectionSettingsFragment extends SubScreenFragment mUseContactsPreference = (SwitchPreference) findPreference(Settings.PREF_KEY_USE_CONTACTS_DICT); turnOffUseContactsIfNoPermission(); + + final SwitchPreference suggestionsEnabledPreference = (SwitchPreference) findPreference( + Settings.PREF_SHOW_SUGGESTIONS); + if (suggestionsEnabledPreference != null) { + suggestionsEnabledPreference.setChecked( + Settings.getInstance().getCurrent().isSuggestionsEnabledPerUserSettings()); + } } private void overwriteUserDictionaryPreference(final Preference userDictionaryPreference) { diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 57018244f..fa5ae00c4 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -184,7 +184,7 @@ public class SettingsValues { && prefs.getBoolean(Settings.PREF_GESTURE_FLOATING_PREVIEW_TEXT, true); mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled && !mInputAttributes.mInputTypeNoAutoCorrect; - mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs); + mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs, res); mIsInternal = Settings.isInternal(prefs); mHasCustomKeyPreviewAnimationParams = prefs.getBoolean( DebugSettings.PREF_HAS_CUSTOM_KEY_PREVIEW_ANIMATION_PARAMS, false); @@ -303,7 +303,7 @@ public 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)); @@ -312,7 +312,8 @@ public 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, |