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

Follow API removal of LocaleList#getPrimary(). 

This follows up to a recent CL [1] that removed #getPrimary() method
from LocaleList class.

 [1] I75f77aea6b75e38793ed8477e5e5a4420d5e6d85
     fee44846376c212114223fc4259382921e6dca7a

Bug: 26984092
Change-Id: Ied4678d35c4dcb380ce24e9bce9336dbbf6c16b8
main
Yohei Yukawa 2016-02-09 01:03:52 -08:00
parent ab5c6774a9
commit 706fce9bb0
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
View File

@ -90,6 +90,9 @@ public final class EditorInfoCompatUtils {
if (localeList == null) { if (localeList == null) {
return null; return null;
} }
return LocaleListCompatUtils.getPrimary(localeList); if (LocaleListCompatUtils.isEmpty(localeList)) {
return null;
}
return LocaleListCompatUtils.get(localeList, 0);
} }
} }

14
java/src/com/android/inputmethod/compat/LocaleListCompatUtils.java
View File

@ -21,14 +21,20 @@ import java.util.Locale;
public final class LocaleListCompatUtils { public final class LocaleListCompatUtils {
private static final Class CLASS_LocaleList = CompatUtils.getClass("android.util.LocaleList"); private static final Class CLASS_LocaleList = CompatUtils.getClass("android.util.LocaleList");
private static final Method METHOD_getPrimary = private static final Method METHOD_get =
CompatUtils.getMethod(CLASS_LocaleList, "getPrimary"); CompatUtils.getMethod(CLASS_LocaleList, "get", int.class);
private static final Method METHOD_isEmpty =
CompatUtils.getMethod(CLASS_LocaleList, "isEmpty");
private LocaleListCompatUtils() { private LocaleListCompatUtils() {
// This utility class is not publicly instantiable. // This utility class is not publicly instantiable.
} }
public static Locale getPrimary(final Object localeList) { public static boolean isEmpty(final Object localeList) {
return (Locale) CompatUtils.invoke(localeList, null, METHOD_getPrimary); return (Boolean) CompatUtils.invoke(localeList, Boolean.FALSE, METHOD_isEmpty);
}
public static Locale get(final Object localeList, final int index) {
return (Locale) CompatUtils.invoke(localeList, null, METHOD_get, index);
} }
} }