Merge "Optimization (A8)"

main
Jean Chalard 2012-06-28 22:12:02 -07:00 committed by Android (Google) Code Review
commit 06bc7fedbd
1 changed files with 13 additions and 9 deletions

View File

@ -245,13 +245,20 @@ public class Suggest {
final ArrayList<SuggestedWordInfo> suggestionsContainer = final ArrayList<SuggestedWordInfo> suggestionsContainer =
new ArrayList<SuggestedWordInfo>(suggestionsSet); new ArrayList<SuggestedWordInfo>(suggestionsSet);
for (int i = 0; i < suggestionsContainer.size(); ++i) { final int suggestionsCount = suggestionsContainer.size();
if (isFirstCharCapitalized || isAllUpperCase || 0 != trailingSingleQuotesCount) {
for (int i = 0; i < suggestionsCount; ++i) {
final SuggestedWordInfo wordInfo = suggestionsContainer.get(i); final SuggestedWordInfo wordInfo = suggestionsContainer.get(i);
final SuggestedWordInfo transformedWordInfo = getTransformedSuggestedWordInfo(wordInfo, final SuggestedWordInfo transformedWordInfo = getTransformedSuggestedWordInfo(
mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount); wordInfo, mLocale, isAllUpperCase, isFirstCharCapitalized,
trailingSingleQuotesCount);
suggestionsContainer.set(i, transformedWordInfo); suggestionsContainer.set(i, transformedWordInfo);
LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(), }
transformedWordInfo.mSourceDict); }
for (int i = 0; i < suggestionsCount; ++i) {
final SuggestedWordInfo wordInfo = suggestionsContainer.get(i);
LatinImeLogger.onAddSuggestedWord(wordInfo.mWord.toString(), wordInfo.mSourceDict);
} }
if (!isPrediction) { if (!isPrediction) {
@ -347,9 +354,6 @@ public class Suggest {
private static SuggestedWordInfo getTransformedSuggestedWordInfo( private static SuggestedWordInfo getTransformedSuggestedWordInfo(
final SuggestedWordInfo wordInfo, final Locale locale, final boolean isAllUpperCase, final SuggestedWordInfo wordInfo, final Locale locale, final boolean isAllUpperCase,
final boolean isFirstCharCapitalized, final int trailingSingleQuotesCount) { final boolean isFirstCharCapitalized, final int trailingSingleQuotesCount) {
if (!isFirstCharCapitalized && !isAllUpperCase && 0 == trailingSingleQuotesCount) {
return wordInfo;
}
final StringBuilder sb = new StringBuilder(getApproxMaxWordLength()); final StringBuilder sb = new StringBuilder(getApproxMaxWordLength());
if (isAllUpperCase) { if (isAllUpperCase) {
sb.append(wordInfo.mWord.toString().toUpperCase(locale)); sb.append(wordInfo.mWord.toString().toUpperCase(locale));