diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-09-13 09:25:23 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-09-13 09:25:23 +0900 |
| commit | 8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5 (patch) | |
| tree | 033b9c08832cad074d69b07033a535fb57e7e923 /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | 6297897fccf4628d83e206f0f75131b928eec529 (diff) | |
| parent | 8e9385cc0993da711e97881a4122f11041f15730 (diff) | |
| download | latinime-8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5.tar.gz latinime-8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5.tar.xz latinime-8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5.zip | |
resolved conflicts for merge of 8e9385cc to master
Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index c891a2e14..270b22a4a 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -149,7 +149,8 @@ public class SettingsValues { ? Settings.readShowsLanguageSwitchKey(prefs) : true /* forcibly */; mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true); mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true); - mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true); + mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true) + && inputAttributes.mIsGeneralTextInput; mBlockPotentiallyOffensive = Settings.readBlockPotentiallyOffensive(prefs, res); mAutoCorrectEnabled = Settings.readAutoCorrectEnabled(autoCorrectionThresholdRawValue, res); mBigramPredictionEnabled = readBigramPredictionEnabled(prefs, res); |