commit db84e0318cbbfa364abb364d961cb5e0d6015012
author Amith Yamasani <yamasani@google.com> Wed Feb 17 14:42:51 2010 -0800
committer Amith Yamasani <yamasani@google.com> Wed Feb 17 14:42:51 2010 -0800
tree 0e9742a0006db81681c5de2dac7649ee010c3e8c
parent e11e283e8814cab8f525336a2b20f342df4341ef

Remove dependency on google-common library.

Copied the newArrayList method over to LatinIME.

Android.mk

diff --git a/Android.mk b/Android.mk
index 5614e8f..ee1a82a 100755
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,5 @@
 
 #LOCAL_SDK_VERSION := current
 
-LOCAL_STATIC_JAVA_LIBRARIES := google-common android-common
 include $(BUILD_PACKAGE)
 include $(LOCAL_PATH)/dictionary/Android.mk

src/com/android/inputmethod/latin/LatinIME.java

diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index a99811c..6257f2d 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.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.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 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 @@
                 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 @@
         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);
 

src/com/android/inputmethod/latin/LatinIMESettings.java

diff --git a/src/com/android/inputmethod/latin/LatinIMESettings.java b/src/com/android/inputmethod/latin/LatinIMESettings.java
index 4dff9c0..f87c56c 100644
--- a/src/com/android/inputmethod/latin/LatinIMESettings.java
+++ b/src/com/android/inputmethod/latin/LatinIMESettings.java
@@ -37,7 +37,6 @@
 
 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 @@
                         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());