diff options
| -rwxr-xr-x | Android.mk | 1 | ||||
| -rw-r--r-- | src/com/android/inputmethod/latin/LatinIME.java | 12 | ||||
| -rw-r--r-- | src/com/android/inputmethod/latin/LatinIMESettings.java | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 5614e8f03..ee1a82adb 100755 --- a/Android.mk +++ b/Android.mk @@ -17,6 +17,5 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common #LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := google-common android-common include $(BUILD_PACKAGE) include $(LOCAL_PATH)/dictionary/Android.mk diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java index a99811c59..6257f2d45 100644 --- a/src/com/android/inputmethod/latin/LatinIME.java +++ b/src/com/android/inputmethod/latin/LatinIME.java @@ -20,7 +20,6 @@ import com.android.inputmethod.voice.EditingUtil; import com.android.inputmethod.voice.FieldContext; import com.android.inputmethod.voice.SettingsUtil; import com.android.inputmethod.voice.VoiceInput; -import com.google.android.collect.Lists; import android.app.AlertDialog; import android.content.BroadcastReceiver; @@ -39,7 +38,6 @@ import android.os.Debug; import android.os.Handler; import android.os.Message; import android.os.SystemClock; -import android.os.Vibrator; import android.preference.PreferenceManager; import android.speech.RecognitionManager; import android.text.AutoText; @@ -64,6 +62,7 @@ import android.view.inputmethod.InputMethodManager; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -1803,7 +1802,7 @@ public class LatinIME extends InputMethodService SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES, DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES); ArrayList<String> voiceInputSupportedLocales = - Lists.newArrayList(supportedLocalesString.split("\\s+")); + newArrayList(supportedLocalesString.split("\\s+")); mLocaleSupportedForVoiceInput = voiceInputSupportedLocales.contains(mLocale); @@ -1884,6 +1883,13 @@ public class LatinIME extends InputMethodService 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) { super.dump(fd, fout, args); diff --git a/src/com/android/inputmethod/latin/LatinIMESettings.java b/src/com/android/inputmethod/latin/LatinIMESettings.java index 4dff9c0f1..f87c56cfc 100644 --- a/src/com/android/inputmethod/latin/LatinIMESettings.java +++ b/src/com/android/inputmethod/latin/LatinIMESettings.java @@ -37,7 +37,6 @@ import android.util.Log; import com.android.inputmethod.voice.SettingsUtil; import com.android.inputmethod.voice.VoiceInputLogger; -import com.google.android.collect.Lists; public class LatinIMESettings extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener, @@ -158,7 +157,7 @@ public class LatinIMESettings extends PreferenceActivity SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES, LatinIME.DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES); ArrayList<String> voiceInputSupportedLocales = - Lists.newArrayList(supportedLocalesString.split("\\s+")); + LatinIME.newArrayList(supportedLocalesString.split("\\s+")); boolean localeSupported = voiceInputSupportedLocales.contains( Locale.getDefault().toString()); |