diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-03-05 21:37:41 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-05 21:37:41 -0800 |
| commit | 7fc7a76b0425be8d72576c5c5e3fd0b619763812 (patch) | |
| tree | de5ea95d53c6b5f97b7d424ff244b555e95bf39b /java/src | |
| parent | cbad260cf3bc1f0f06aacc305608809545969d9f (diff) | |
| parent | 00ed3be95cee472685bcba1ea861ac75c61db690 (diff) | |
| download | latinime-7fc7a76b0425be8d72576c5c5e3fd0b619763812.tar.gz latinime-7fc7a76b0425be8d72576c5c5e3fd0b619763812.tar.xz latinime-7fc7a76b0425be8d72576c5c5e3fd0b619763812.zip | |
Merge "Correct special space handling of punctuation"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsValues.java | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 64b9f3364..742328256 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1610,6 +1610,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar final boolean swapWeakSpace = maybeStripSpaceWhileInBatchEdit(ic, primaryCode, spaceState, KeyboardActionListener.SUGGESTION_STRIP_COORDINATE == x); + if (SPACE_STATE_PHANTOM == spaceState && + mSettingsValues.isPhantomSpacePromotingSymbol(primaryCode)) { + sendKeyCodePoint(Keyboard.CODE_SPACE); + } sendKeyCodePoint(primaryCode); if (Keyboard.CODE_SPACE == primaryCode) { diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index d123b608f..6d65a74c8 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -37,6 +37,7 @@ public class SettingsValues { public final int mDelayUpdateOldSuggestions; public final String mWeakSpaceStrippers; public final String mWeakSpaceSwappers; + private final String mPhantomSpacePromotingSymbols; private final String mSuggestPuncs; public final SuggestedWords mSuggestPuncList; public final SuggestedWords mSuggestPuncOutputTextList; @@ -91,6 +92,7 @@ public class SettingsValues { mDelayUpdateOldSuggestions = res.getInteger(R.integer.config_delay_update_old_suggestions); mWeakSpaceStrippers = res.getString(R.string.weak_space_stripping_symbols); mWeakSpaceSwappers = res.getString(R.string.weak_space_swapping_symbols); + mPhantomSpacePromotingSymbols = res.getString(R.string.phantom_space_promoting_symbols); if (LatinImeLogger.sDBG) { final int length = mWeakSpaceStrippers.length(); for (int i = 0; i < length; i = mWeakSpaceStrippers.offsetByCodePoints(i, 1)) { @@ -192,7 +194,7 @@ public class SettingsValues { final String weakSpaceSwappers, final String symbolsExcludedFromWordSeparators, final Resources res) { String wordSeparators = weakSpaceStrippers + weakSpaceSwappers - + res.getString(R.string.weak_space_promoting_symbols); + + res.getString(R.string.phantom_space_promoting_symbols); for (int i = symbolsExcludedFromWordSeparators.length() - 1; i >= 0; --i) { wordSeparators = wordSeparators.replace( symbolsExcludedFromWordSeparators.substring(i, i + 1), ""); @@ -225,6 +227,11 @@ public class SettingsValues { return mWeakSpaceSwappers.contains(String.valueOf((char)code)); } + public boolean isPhantomSpacePromotingSymbol(int code) { + // TODO: this does not work if the code does not fit in a char + return mPhantomSpacePromotingSymbols.contains(String.valueOf((char)code)); + } + private static boolean isAutoCorrectEnabled(final Resources resources, final String currentAutoCorrectionSetting) { final String autoCorrectionOff = resources.getString( |