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

Merge "Clean up UserDictionaryCompatUtils"

main
Tadashi G. Takaoka 2014-10-29 00:37:41 +00:00 committed by Android (Google) Code Review
parent 4beeb9253a dccf4f2a41
commit 48ee473c1e
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
java/src/com/android/inputmethod/compat/UserDictionaryCompatUtils.java
View File

@ -16,42 +16,33 @@
package com.android.inputmethod.compat; package com.android.inputmethod.compat;
import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.provider.UserDictionary.Words; import android.os.Build;
import android.provider.UserDictionary;
import java.lang.reflect.Method;
import java.util.Locale; import java.util.Locale;
public final class UserDictionaryCompatUtils { public final class UserDictionaryCompatUtils {
// UserDictionary.Words#addWord(Context, String, int, String, Locale) was introduced
// in API level 16 (Build.VERSION_CODES.JELLY_BEAN).
private static final Method METHOD_addWord = CompatUtils.getMethod(Words.class, "addWord",
Context.class, String.class, int.class, String.class, Locale.class);
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static void addWord(final Context context, final String word, public static void addWord(final Context context, final String word,
final int freq, final String shortcut, final Locale locale) { final int freq, final String shortcut, final Locale locale) {
if (hasNewerAddWord()) { if (BuildCompatUtils.EFFECTIVE_SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
CompatUtils.invoke(Words.class, null, METHOD_addWord, context, word, freq, shortcut, addWordWithShortcut(context, word, freq, shortcut, locale);
locale); return;
} else {
// Fall back to the pre-JellyBean method.
final int localeType;
if (null == locale) {
localeType = Words.LOCALE_TYPE_ALL;
} else {
final Locale currentLocale = context.getResources().getConfiguration().locale;
if (locale.equals(currentLocale)) {
localeType = Words.LOCALE_TYPE_CURRENT;
} else {
localeType = Words.LOCALE_TYPE_ALL;
}
}
Words.addWord(context, word, freq, localeType);
} }
// Fall back to the pre-JellyBean method.
final Locale currentLocale = context.getResources().getConfiguration().locale;
final int localeType = currentLocale.equals(locale)
? UserDictionary.Words.LOCALE_TYPE_CURRENT : UserDictionary.Words.LOCALE_TYPE_ALL;
UserDictionary.Words.addWord(context, word, freq, localeType);
} }
public static final boolean hasNewerAddWord() { // {@link UserDictionary.Words#addWord(Context,String,int,String,Locale)} was introduced
return null != METHOD_addWord; // in API level 16 (Build.VERSION_CODES.JELLY_BEAN).
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private static void addWordWithShortcut(final Context context, final String word,
final int freq, final String shortcut, final Locale locale) {
UserDictionary.Words.addWord(context, word, freq, shortcut, locale);
} }
} }