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

Remove dependency on google-common library. 

Copied the newArrayList method over to LatinIME.
main
Amith Yamasani 2010-02-17 14:42:51 -08:00
parent e11e283e88
commit db84e0318c
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@ -17,6 +17,5 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
#LOCAL_SDK_VERSION := current #LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := google-common android-common
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/dictionary/Android.mk include $(LOCAL_PATH)/dictionary/Android.mk

12
src/com/android/inputmethod/latin/LatinIME.java
View File

@ -20,7 +20,6 @@ import com.android.inputmethod.voice.EditingUtil;
import com.android.inputmethod.voice.FieldContext; import com.android.inputmethod.voice.FieldContext;
import com.android.inputmethod.voice.SettingsUtil; import com.android.inputmethod.voice.SettingsUtil;
import com.android.inputmethod.voice.VoiceInput; import com.android.inputmethod.voice.VoiceInput;
import com.google.android.collect.Lists;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@ -39,7 +38,6 @@ import android.os.Debug;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.Vibrator;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.speech.RecognitionManager; import android.speech.RecognitionManager;
import android.text.AutoText; import android.text.AutoText;
@ -64,6 +62,7 @@ import android.view.inputmethod.InputMethodManager;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -1803,7 +1802,7 @@ public class LatinIME extends InputMethodService
SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES, SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES,
DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES); DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES);
ArrayList<String> voiceInputSupportedLocales = ArrayList<String> voiceInputSupportedLocales =
Lists.newArrayList(supportedLocalesString.split("\\s+")); newArrayList(supportedLocalesString.split("\\s+"));
mLocaleSupportedForVoiceInput = voiceInputSupportedLocales.contains(mLocale); mLocaleSupportedForVoiceInput = voiceInputSupportedLocales.contains(mLocale);
@ -1884,6 +1883,13 @@ public class LatinIME extends InputMethodService
updateShiftKeyState(getCurrentInputEditorInfo()); updateShiftKeyState(getCurrentInputEditorInfo());
} }
public static <E> ArrayList<E> newArrayList(E... elements) {
int capacity = (elements.length * 110) / 100 + 5;
ArrayList<E> list = new ArrayList<E>(capacity);
Collections.addAll(list, elements);
return list;
}
@Override protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) { @Override protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
super.dump(fd, fout, args); super.dump(fd, fout, args);

3
src/com/android/inputmethod/latin/LatinIMESettings.java
View File

@ -37,7 +37,6 @@ import android.util.Log;
import com.android.inputmethod.voice.SettingsUtil; import com.android.inputmethod.voice.SettingsUtil;
import com.android.inputmethod.voice.VoiceInputLogger; import com.android.inputmethod.voice.VoiceInputLogger;
import com.google.android.collect.Lists;
public class LatinIMESettings extends PreferenceActivity public class LatinIMESettings extends PreferenceActivity
implements SharedPreferences.OnSharedPreferenceChangeListener, implements SharedPreferences.OnSharedPreferenceChangeListener,
@ -158,7 +157,7 @@ public class LatinIMESettings extends PreferenceActivity
SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES, SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES,
LatinIME.DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES); LatinIME.DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES);
ArrayList<String> voiceInputSupportedLocales = ArrayList<String> voiceInputSupportedLocales =
Lists.newArrayList(supportedLocalesString.split("\\s+")); LatinIME.newArrayList(supportedLocalesString.split("\\s+"));
boolean localeSupported = voiceInputSupportedLocales.contains( boolean localeSupported = voiceInputSupportedLocales.contains(
Locale.getDefault().toString()); Locale.getDefault().toString());