aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-10-06 15:03:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-06 15:03:20 +0000
commitdb6c32778e80acc156a118f13ff2788a9277da30 (patch)
tree4ace4f1d9ab46e91449beb0ef975970966077dbb
parent96d97ee23cc325f7045eb3cf3097d614cf35a5ff (diff)
parent03c1e7955abf089f3bf5027d506336c07d970180 (diff)
downloadlatinime-db6c32778e80acc156a118f13ff2788a9277da30.tar.gz
latinime-db6c32778e80acc156a118f13ff2788a9277da30.tar.xz
latinime-db6c32778e80acc156a118f13ff2788a9277da30.zip
Merge "Add a utility method to SuggestionSpanUtils"
-rw-r--r--java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java28
-rw-r--r--tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java26
2 files changed, 54 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
index 27db9b8e8..d3e24e342 100644
--- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
+++ b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
@@ -28,9 +28,13 @@ import com.android.inputmethod.latin.SuggestedWords;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
import com.android.inputmethod.latin.SuggestionSpanPickedNotificationReceiver;
import com.android.inputmethod.latin.define.DebugFlags;
+import com.android.inputmethod.latin.utils.LocaleUtils;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Locale;
+
+import javax.annotation.Nullable;
public final class SuggestionSpanUtils {
// Note that SuggestionSpan.FLAG_AUTO_CORRECTION has been introduced
@@ -98,4 +102,28 @@ public final class SuggestionSpanUtils {
spannable.setSpan(suggestionSpan, 0, pickedWord.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannable;
}
+
+ /**
+ * Returns first {@link Locale} found in the given array of {@link SuggestionSpan}.
+ * @param suggestionSpans the array of {@link SuggestionSpan} to be examined.
+ * @return the first {@link Locale} found in {@code suggestionSpans}. {@code null} when not
+ * found.
+ */
+ @UsedForTesting
+ @Nullable
+ public static Locale findFirstLocaleFromSuggestionSpans(
+ final SuggestionSpan[] suggestionSpans) {
+ for (final SuggestionSpan suggestionSpan : suggestionSpans) {
+ final String localeString = suggestionSpan.getLocale();
+ if (TextUtils.isEmpty(localeString)) {
+ continue;
+ }
+ final Locale locale = LocaleUtils.constructLocaleFromString(localeString);
+ if (locale == null) {
+ continue;
+ }
+ return locale;
+ }
+ return null;
+ }
}
diff --git a/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java b/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java
index a6b3af4c2..1c320db1c 100644
--- a/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java
+++ b/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java
@@ -178,4 +178,30 @@ public class SuggestionSpanUtilsTest extends AndroidTestCase {
typedAndCollectedWords));
}
}
+
+ public void testFindFirstLocaleFromSuggestionSpans() {
+ final String[] suggestions = new String[] {"Quality", "Speed", "Price"};
+ final SuggestionSpan nullLocaleSpan = new SuggestionSpan((Locale)null, suggestions, 0);
+ final SuggestionSpan emptyLocaleSpan = new SuggestionSpan(new Locale(""), suggestions, 0);
+ final SuggestionSpan enUsLocaleSpan = new SuggestionSpan(Locale.US, suggestions, 0);
+ final SuggestionSpan jaJpLocaleSpan = new SuggestionSpan(Locale.JAPAN, suggestions, 0);
+
+ assertEquals(null, SuggestionSpanUtils.findFirstLocaleFromSuggestionSpans(
+ new SuggestionSpan[] {}));
+
+ assertEquals(null, SuggestionSpanUtils.findFirstLocaleFromSuggestionSpans(
+ new SuggestionSpan[] {emptyLocaleSpan}));
+
+ assertEquals(Locale.US, SuggestionSpanUtils.findFirstLocaleFromSuggestionSpans(
+ new SuggestionSpan[] {enUsLocaleSpan}));
+
+ assertEquals(Locale.US, SuggestionSpanUtils.findFirstLocaleFromSuggestionSpans(
+ new SuggestionSpan[] {nullLocaleSpan, enUsLocaleSpan}));
+
+ assertEquals(Locale.US, SuggestionSpanUtils.findFirstLocaleFromSuggestionSpans(
+ new SuggestionSpan[] {nullLocaleSpan, emptyLocaleSpan, enUsLocaleSpan}));
+
+ assertEquals(Locale.JAPAN, SuggestionSpanUtils.findFirstLocaleFromSuggestionSpans(
+ new SuggestionSpan[] {nullLocaleSpan, jaJpLocaleSpan, enUsLocaleSpan}));
+ }
}