diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-09-13 00:42:19 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-13 00:42:19 +0000 |
| commit | 99a56b94c7a4e88862167df382f9f9c0b1b94084 (patch) | |
| tree | 870b065eab971973424475f64820342763dcd5f3 /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | a2e84da9cc287a3cae40641dde1fff46d343b933 (diff) | |
| parent | 8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5 (diff) | |
| download | latinime-99a56b94c7a4e88862167df382f9f9c0b1b94084.tar.gz latinime-99a56b94c7a4e88862167df382f9f9c0b1b94084.tar.xz latinime-99a56b94c7a4e88862167df382f9f9c0b1b94084.zip | |
am 8ed81f9f: resolved conflicts for merge of 8e9385cc to master
* commit '8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5':
Only do double-space-period on real text fields.
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); |