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

am 9214f17b: Merge "[IL100] Pull up a check" 

* commit '9214f17b862aa6b35dcda15ad14d3604e90988bb':
  [IL100] Pull up a check
main
Jean Chalard 2014-01-28 01:45:35 -08:00 committed by Android Git Automerger
parent ec725d1421 9214f17b86
commit fc12004571
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1428,8 +1428,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// TODO[IL]: Define a clean interface for this // TODO[IL]: Define a clean interface for this
public void showSuggestionStrip(final SuggestedWords suggestedWords) { public void showSuggestionStrip(final SuggestedWords suggestedWords) {
showSuggestionStripWithTypedWord(suggestedWords, suggestedWords.isEmpty() ? null showSuggestionStripWithTypedWord(suggestedWords, suggestedWords.mTypedWord);
: suggestedWords.getWord(SuggestedWords.INDEX_OF_TYPED_WORD));
} }
// Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener} // Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener}

2
java/src/com/android/inputmethod/latin/SuggestedWords.java
View File

@ -39,6 +39,7 @@ public final class SuggestedWords {
public static final SuggestedWords EMPTY = new SuggestedWords( public static final SuggestedWords EMPTY = new SuggestedWords(
EMPTY_WORD_INFO_LIST, false, false, false, false, false); EMPTY_WORD_INFO_LIST, false, false, false, false, false);
public final String mTypedWord;
public final boolean mTypedWordValid; public final boolean mTypedWordValid;
// Note: this INCLUDES cases where the word will auto-correct to itself. A good definition // Note: this INCLUDES cases where the word will auto-correct to itself. A good definition
// of what this flag means would be "the top suggestion is strong enough to auto-correct", // of what this flag means would be "the top suggestion is strong enough to auto-correct",
@ -74,6 +75,7 @@ public final class SuggestedWords {
mIsObsoleteSuggestions = isObsoleteSuggestions; mIsObsoleteSuggestions = isObsoleteSuggestions;
mIsPrediction = isPrediction; mIsPrediction = isPrediction;
mSequenceNumber = sequenceNumber; mSequenceNumber = sequenceNumber;
mTypedWord = suggestedWordInfoList.isEmpty() ? null : getWord(INDEX_OF_TYPED_WORD);
} }
public boolean isEmpty() { public boolean isEmpty() {