nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am bd5192ae: Merge "Add a relevant suggestion to period-checkable requests" 

* commit 'bd5192ae260c3f462c36d7eefe76d9517b3528d5':
  Add a relevant suggestion to period-checkable requests
main
Jean Chalard 2014-06-27 06:52:24 +00:00 committed by Android Git Automerger
parent 1c07da6127 bd5192ae26
commit b9683c0b9c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/src/com/android/inputmethod/latin/Constants.java
View File

@ -220,6 +220,7 @@ public final class Constants {
public static final String REGEXP_PERIOD = "\\."; public static final String REGEXP_PERIOD = "\\.";
public static final String STRING_SPACE = " "; public static final String STRING_SPACE = " ";
public static final String STRING_PERIOD_AND_SPACE = ". ";
/** /**
* Special keys code. Must be negative. * Special keys code. Must be negative.

5
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -741,13 +741,12 @@ public final class RichInputConnection {
// Here we test whether we indeed have a period and a space before us. This should not // Here we test whether we indeed have a period and a space before us. This should not
// be needed, but it's there just in case something went wrong. // be needed, but it's there just in case something went wrong.
final CharSequence textBeforeCursor = getTextBeforeCursor(2, 0); final CharSequence textBeforeCursor = getTextBeforeCursor(2, 0);
final String periodSpace = ". "; if (!TextUtils.equals(Constants.STRING_PERIOD_AND_SPACE, textBeforeCursor)) {
if (!TextUtils.equals(periodSpace, textBeforeCursor)) {
// Theoretically we should not be coming here if there isn't ". " before the // Theoretically we should not be coming here if there isn't ". " before the
// cursor, but the application may be changing the text while we are typing, so // cursor, but the application may be changing the text while we are typing, so
// anything goes. We should not crash. // anything goes. We should not crash.
Log.d(TAG, "Tried to revert double-space combo but we didn't find " Log.d(TAG, "Tried to revert double-space combo but we didn't find "
+ "\"" + periodSpace + "\" just before the cursor."); + "\"" + Constants.STRING_PERIOD_AND_SPACE + "\" just before the cursor.");
return false; return false;
} }
// Double-space results in ". ". A backspace to cancel this should result in a single // Double-space results in ". ". A backspace to cancel this should result in a single

4
java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
View File

@ -258,7 +258,9 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session {
return new SuggestionsInfo(SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO return new SuggestionsInfo(SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO
| SuggestionsInfo.RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS, | SuggestionsInfo.RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS,
new String[] { new String[] {
TextUtils.join(Constants.STRING_SPACE, splitText) }); TextUtils.join(Constants.STRING_SPACE, splitText),
TextUtils.join(Constants.STRING_PERIOD_AND_SPACE,
splitText) });
} }
} }
return dictInfo.mDictionary.isValidWord(inText) return dictInfo.mDictionary.isValidWord(inText)