Merge "Refactor string removal to make it static"
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index a2d66f3..937457e 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -426,7 +426,7 @@
if (typedWord != null) {
mSuggestions.add(0, typedWordString);
}
- removeDupes();
+ removeDupes(mSuggestions);
if (DBG) {
double normalizedScore = mAutoCorrection.getNormalizedScore();
@@ -453,8 +453,7 @@
return new SuggestedWords.Builder().addWords(mSuggestions, null);
}
- private void removeDupes() {
- final ArrayList<CharSequence> suggestions = mSuggestions;
+ private static void removeDupes(final ArrayList<CharSequence> suggestions) {
if (suggestions.size() < 2) return;
int i = 1;
// Don't cache suggestions.size(), since we may be removing items
@@ -464,7 +463,7 @@
for (int j = 0; j < i; j++) {
CharSequence previous = suggestions.get(j);
if (TextUtils.equals(cur, previous)) {
- removeFromSuggestions(i);
+ removeFromSuggestions(suggestions, i);
i--;
break;
}
@@ -473,10 +472,12 @@
}
}
- private void removeFromSuggestions(int index) {
- CharSequence garbage = mSuggestions.remove(index);
+ private static void removeFromSuggestions(final ArrayList<CharSequence> suggestions,
+ final int index) {
+ final CharSequence garbage = suggestions.remove(index);
if (garbage != null && garbage instanceof StringBuilder) {
- mStringPool.add(garbage);
+ // TODO: rebase this over the static string builder pool
+ // mStringPool.add(garbage);
}
}