aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-02-27 14:40:54 +0900
committerJean Chalard <jchalard@google.com>2014-02-27 14:40:54 +0900
commit71e3ecd0a2bc6edddee32eef8bf709cf8bd5c88c (patch)
treeaac8f47c620b975288325645f077a330f86ac61c /java/src/com
parent8c1e3280f90366035533aa8614b651be770bd23f (diff)
downloadlatinime-71e3ecd0a2bc6edddee32eef8bf709cf8bd5c88c.tar.gz
latinime-71e3ecd0a2bc6edddee32eef8bf709cf8bd5c88c.tar.xz
latinime-71e3ecd0a2bc6edddee32eef8bf709cf8bd5c88c.zip
Fix a bug with auto-caps entries from personalization
Bug: 13215163 Change-Id: I00099cb4927c96de46e57e14ab906d41c9c2151a
Diffstat (limited to 'java/src/com')
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 5e144106f..e77cce0d4 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -133,12 +133,17 @@ public final class Suggest {
mDictionaryFacilitator.getSuggestions(wordComposerForLookup, prevWordForBigram,
proximityInfo, blockOffensiveWords, additionalFeaturesOptions, SESSION_TYPING,
suggestionsSet, rawSuggestions);
+
+ final boolean isFirstCharCapitalized = wordComposer.isFirstCharCapitalized();
+ final boolean isAllUpperCase = wordComposer.isAllUpperCase();
final String firstSuggestion;
final String whitelistedWord;
if (suggestionsSet.isEmpty()) {
whitelistedWord = firstSuggestion = null;
} else {
- final SuggestedWordInfo firstSuggestedWordInfo = suggestionsSet.first();
+ final SuggestedWordInfo firstSuggestedWordInfo = getTransformedSuggestedWordInfo(
+ suggestionsSet.first(), mLocale, isAllUpperCase, isFirstCharCapitalized,
+ trailingSingleQuotesCount);
firstSuggestion = firstSuggestedWordInfo.mWord;
if (SuggestedWordInfo.KIND_WHITELIST != firstSuggestedWordInfo.mKind) {
whitelistedWord = null;
@@ -189,8 +194,6 @@ public final class Suggest {
final ArrayList<SuggestedWordInfo> suggestionsContainer =
CollectionUtils.newArrayList(suggestionsSet);
final int suggestionsCount = suggestionsContainer.size();
- final boolean isFirstCharCapitalized = wordComposer.isFirstCharCapitalized();
- final boolean isAllUpperCase = wordComposer.isAllUpperCase();
if (isFirstCharCapitalized || isAllUpperCase || 0 != trailingSingleQuotesCount) {
for (int i = 0; i < suggestionsCount; ++i) {
final SuggestedWordInfo wordInfo = suggestionsContainer.get(i);