2 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/inputmethod/latin/BinaryDictionary.java b/src/com/android/inputmethod/latin/BinaryDictionary.java
index ec467c88d..43f4c4cb6 100644
--- a/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -138,7 +138,6 @@ public class BinaryDictionary extends Dictionary {
     @Override
     public synchronized void close() {
         if (mNativeDict != 0) {
-            System.err.println("Closing BinaryDictionary");
             closeNative(mNativeDict);
             mNativeDict = 0;
         }
diff --git a/src/com/android/inputmethod/latin/InputLanguageSelection.java b/src/com/android/inputmethod/latin/InputLanguageSelection.java
index 73298e33c..b1ddb2175 100644
--- a/src/com/android/inputmethod/latin/InputLanguageSelection.java
+++ b/src/com/android/inputmethod/latin/InputLanguageSelection.java
@@ -34,6 +34,9 @@ public class InputLanguageSelection extends PreferenceActivity {
 
     private String mSelectedLanguages;
     private ArrayList<Loc> mAvailableLanguages = new ArrayList<Loc>();
+    private static final String[] BLACKLIST_LANGUAGES = {
+        "ko", "ja", "zh"
+    };
 
     private static class Loc implements Comparable {
         static Collator sCollator = Collator.getInstance();
@@ -137,6 +140,9 @@ public class InputLanguageSelection extends PreferenceActivity {
                 String country = s.substring(3, 5);
                 Locale l = new Locale(language, country);
 
+                // Exclude languages that are not relevant to LatinIME
+                if (arrayContains(BLACKLIST_LANGUAGES, language)) continue;
+
                 if (finalSize == 0) {
                     preprocess[finalSize++] =
                             new Loc(LanguageSwitcher.toTitleCase(l.getDisplayName(l)), l);
@@ -167,4 +173,11 @@ public class InputLanguageSelection extends PreferenceActivity {
         }
         return uniqueLocales;
     }
+
+    private boolean arrayContains(String[] array, String value) {
+        for (int i = 0; i < array.length; i++) {
+            if (array[i].equalsIgnoreCase(value)) return true;
+        }
+        return false;
+    }
 }