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

am 90086846: Merge "Change the logic of the LOOKS_LIKE_TYPO flag" 

* commit '90086846dc9a677dafc1ea92138ac88f3f933046':
  Change the logic of the LOOKS_LIKE_TYPO flag
main
Jean Chalard 2011-09-28 04:03:15 -07:00 committed by Android Git Automerger
parent c4518d54ac 90086846dc
commit 6238d1a3cd
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
View File

@ -85,10 +85,10 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
private static class SuggestionsGatherer implements WordCallback { private static class SuggestionsGatherer implements WordCallback {
public static class Result { public static class Result {
public final String[] mSuggestions; public final String[] mSuggestions;
public final boolean mLooksLikeTypo; public final boolean mHasLikelySuggestions;
public Result(final String[] gatheredSuggestions, final boolean looksLikeTypo) { public Result(final String[] gatheredSuggestions, final boolean hasLikelySuggestions) {
mSuggestions = gatheredSuggestions; mSuggestions = gatheredSuggestions;
mLooksLikeTypo = looksLikeTypo; mHasLikelySuggestions = hasLikelySuggestions;
} }
} }
@ -149,19 +149,19 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
public Result getResults(final CharSequence originalText, final double threshold, public Result getResults(final CharSequence originalText, final double threshold,
final int capitalizeType, final Locale locale) { final int capitalizeType, final Locale locale) {
final String[] gatheredSuggestions; final String[] gatheredSuggestions;
final boolean looksLikeTypo; final boolean hasLikelySuggestions;
if (0 == mLength) { if (0 == mLength) {
// Either we found no suggestions, or we found some BUT the max length was 0. // Either we found no suggestions, or we found some BUT the max length was 0.
// If we found some mBestSuggestion will not be null. If it is null, then // If we found some mBestSuggestion will not be null. If it is null, then
// we found none, regardless of the max length. // we found none, regardless of the max length.
if (null == mBestSuggestion) { if (null == mBestSuggestion) {
gatheredSuggestions = null; gatheredSuggestions = null;
looksLikeTypo = false; hasLikelySuggestions = false;
} else { } else {
gatheredSuggestions = EMPTY_STRING_ARRAY; gatheredSuggestions = EMPTY_STRING_ARRAY;
final double normalizedScore = final double normalizedScore =
Utils.calcNormalizedScore(originalText, mBestSuggestion, mBestScore); Utils.calcNormalizedScore(originalText, mBestSuggestion, mBestScore);
looksLikeTypo = (normalizedScore > threshold); hasLikelySuggestions = (normalizedScore > threshold);
} }
} else { } else {
if (DBG) { if (DBG) {
@ -195,14 +195,14 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
final CharSequence bestSuggestion = mSuggestions.get(0); final CharSequence bestSuggestion = mSuggestions.get(0);
final double normalizedScore = final double normalizedScore =
Utils.calcNormalizedScore(originalText, bestSuggestion, bestScore); Utils.calcNormalizedScore(originalText, bestSuggestion, bestScore);
looksLikeTypo = (normalizedScore > threshold); hasLikelySuggestions = (normalizedScore > threshold);
if (DBG) { if (DBG) {
Log.i(TAG, "Best suggestion : " + bestSuggestion + ", score " + bestScore); Log.i(TAG, "Best suggestion : " + bestSuggestion + ", score " + bestScore);
Log.i(TAG, "Normalized score = " + normalizedScore + " (threshold " + threshold Log.i(TAG, "Normalized score = " + normalizedScore + " (threshold " + threshold
+ ") => looksLikeTypo = " + looksLikeTypo); + ") => hasLikelySuggestions = " + hasLikelySuggestions);
} }
} }
return new Result(gatheredSuggestions, looksLikeTypo); return new Result(gatheredSuggestions, hasLikelySuggestions);
} }
} }
@ -349,6 +349,7 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
} }
} }
// TODO: Don't gather suggestions if the limit is <= 0 unless necessary
final SuggestionsGatherer suggestionsGatherer = final SuggestionsGatherer suggestionsGatherer =
new SuggestionsGatherer(suggestionsLimit); new SuggestionsGatherer(suggestionsLimit);
final WordComposer composer = new WordComposer(); final WordComposer composer = new WordComposer();
@ -397,17 +398,18 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
if (DBG) { if (DBG) {
Log.i(TAG, "Spell checking results for " + text + " with suggestion limit " Log.i(TAG, "Spell checking results for " + text + " with suggestion limit "
+ suggestionsLimit); + suggestionsLimit);
Log.i(TAG, "IsInDict = " + result.mLooksLikeTypo); Log.i(TAG, "IsInDict = " + isInDict);
Log.i(TAG, "LooksLikeTypo = " + result.mLooksLikeTypo); Log.i(TAG, "LooksLikeTypo = " + (!isInDict));
Log.i(TAG, "HasLikelySuggestions = " + result.mHasLikelySuggestions);
for (String suggestion : result.mSuggestions) { for (String suggestion : result.mSuggestions) {
Log.i(TAG, suggestion); Log.i(TAG, suggestion);
} }
} }
// TODO: actually use result.mHasLikelySuggestions
final int flags = final int flags =
(isInDict ? SuggestionsInfo.RESULT_ATTR_IN_THE_DICTIONARY : 0) (isInDict ? SuggestionsInfo.RESULT_ATTR_IN_THE_DICTIONARY
| (result.mLooksLikeTypo : SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO);
? SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO : 0);
return new SuggestionsInfo(flags, result.mSuggestions); return new SuggestionsInfo(flags, result.mSuggestions);
} catch (RuntimeException e) { } catch (RuntimeException e) {
// Don't kill the keyboard if there is a bug in the spell checker // Don't kill the keyboard if there is a bug in the spell checker