am 77827e7b: Merge "Don\'t start composing on dash."

* commit '77827e7b3bb0e76ef4d39eae01fd83fe3c4f06b2':
  Don't start composing on dash.
This commit is contained in:
Jean Chalard 2013-08-21 01:37:36 -07:00 committed by Android Git Automerger
commit 54978cafa5

View file

@ -2051,10 +2051,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
(!mConnection.isCursorTouchingWord(currentSettings)
|| !currentSettings.mCurrentLanguageHasSpaces)) {
// Reset entirely the composing state anyway, then start composing a new word unless
// the character is a single quote. The idea here is, single quote is not a
// separator and it should be treated as a normal character, except in the first
// position where it should not start composing a word.
isComposingWord = (Constants.CODE_SINGLE_QUOTE != primaryCode);
// the character is a single quote or a dash. The idea here is, single quote and dash
// are not separators and they should be treated as normal characters, except in the
// first position where they should not start composing a word.
isComposingWord = (Constants.CODE_SINGLE_QUOTE != primaryCode
&& Constants.CODE_DASH != primaryCode);
// Here we don't need to reset the last composed word. It will be reset
// when we commit this one, if we ever do; if on the other hand we backspace
// it entirely and resume suggestions on the previous word, we'd like to still