parent
bdf6d1b18b
commit
f985efe39c
|
@ -931,8 +931,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
|||
false /* typedWordValid */,
|
||||
false /* hasAutoCorrectionCandidate */,
|
||||
false /* allowsToBeAutoCorrected */,
|
||||
false /* isPunctuationSuggestions */,
|
||||
false /* shouldBlockAutoCorrectionBySafetyNet */);
|
||||
false /* isPunctuationSuggestions */);
|
||||
// When in fullscreen mode, show completions generated by the application
|
||||
final boolean isAutoCorrection = false;
|
||||
setSuggestions(suggestedWords, isAutoCorrection);
|
||||
|
@ -1794,8 +1793,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
|||
false /* typedWordValid */,
|
||||
false /* hasAutoCorrectionCandidate */,
|
||||
false /* allowsToBeAutoCorrected */,
|
||||
false /* isPunctuationSuggestions */,
|
||||
false /* shouldBlockAutoCorrectionBySafetyNet */);
|
||||
false /* isPunctuationSuggestions */);
|
||||
showSuggestions(obsoleteSuggestedWords, typedWord);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -187,8 +187,7 @@ public class SettingsValues {
|
|||
false /* typedWordValid */,
|
||||
false /* hasAutoCorrectionCandidate */,
|
||||
false /* allowsToBeAutoCorrected */,
|
||||
true /* isPunctuationSuggestions */,
|
||||
false /* shouldBlockAutoCorrectionBySafetyNet */);
|
||||
true /* isPunctuationSuggestions */);
|
||||
}
|
||||
|
||||
private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
|
||||
|
@ -209,8 +208,7 @@ public class SettingsValues {
|
|||
false /* typedWordValid */,
|
||||
false /* hasAutoCorrectionCandidate */,
|
||||
false /* allowsToBeAutoCorrected */,
|
||||
true /* isPunctuationSuggestions */,
|
||||
false /* shouldBlockAutoCorrectionBySafetyNet */);
|
||||
true /* isPunctuationSuggestions */);
|
||||
}
|
||||
|
||||
private static String createWordSeparators(final String weakSpaceStrippers,
|
||||
|
|
|
@ -273,8 +273,7 @@ public class Suggest implements Dictionary.WordCallback {
|
|||
false /* typedWordValid */,
|
||||
false /* hasAutoCorrectionCandidate */,
|
||||
false /* allowsToBeAutoCorrected */,
|
||||
false /* isPunctuationSuggestions */,
|
||||
false /* shouldBlockAutoCorrectionBySafetyNet */);
|
||||
false /* isPunctuationSuggestions */);
|
||||
}
|
||||
|
||||
// TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
|
||||
|
@ -446,10 +445,10 @@ public class Suggest implements Dictionary.WordCallback {
|
|||
}
|
||||
return new SuggestedWords(scoreInfoList,
|
||||
!allowsToBeAutoCorrected /* typedWordValid */,
|
||||
autoCorrectionAvailable /* hasAutoCorrectionCandidate */,
|
||||
autoCorrectionAvailable & !shouldBlockAutoCorrectionBySatefyNet
|
||||
/* hasAutoCorrectionCandidate */,
|
||||
allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,
|
||||
false /* isPunctuationSuggestions */,
|
||||
shouldBlockAutoCorrectionBySatefyNet);
|
||||
false /* isPunctuationSuggestions */);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -25,7 +25,7 @@ import java.util.List;
|
|||
|
||||
public class SuggestedWords {
|
||||
public static final SuggestedWords EMPTY = new SuggestedWords(
|
||||
Collections.<SuggestedWordInfo>emptyList(), false, false, false, false, false);
|
||||
Collections.<SuggestedWordInfo>emptyList(), false, false, false, false);
|
||||
|
||||
public final boolean mTypedWordValid;
|
||||
public final boolean mHasAutoCorrectionCandidate;
|
||||
|
@ -37,12 +37,10 @@ public class SuggestedWords {
|
|||
final boolean typedWordValid,
|
||||
final boolean hasAutoCorrectionCandidate,
|
||||
final boolean allowsToBeAutoCorrected,
|
||||
final boolean isPunctuationSuggestions,
|
||||
final boolean shouldBlockAutoCorrectionBySafetyNet) {
|
||||
final boolean isPunctuationSuggestions) {
|
||||
mSuggestedWordInfoList = suggestedWordInfoList;
|
||||
mTypedWordValid = typedWordValid;
|
||||
mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate
|
||||
&& !shouldBlockAutoCorrectionBySafetyNet;
|
||||
mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;
|
||||
mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
|
||||
mIsPunctuationSuggestions = isPunctuationSuggestions;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue