commit a849f9f74b69852643e4d13d9523f8af7e61d748
author satok <satok@google.com> Mon Sep 05 04:04:17 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 05 04:04:17 2011 -0700
tree ba088d7d31789e5c4209c99ed021df12559e7bb5
parent 5efb531d2dc0287c8c8fd954c3f46ea5550f3f7c
parent 94bc76f1aa887e90b31f375cb1e9a2ecc3c59c8b

Merge "Support automatic language"

src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java

diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index f62edc4..413b5b4 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -345,17 +345,6 @@
     }
 
     public static boolean isAuxiliaryIme(InputMethodInfo imi) {
-        final int subtypeCount = imi.getSubtypeCount();
-        if (subtypeCount == 0) {
-            return false;
-        } else {
-            for (int i = 0; i < subtypeCount; ++i) {
-                final InputMethodSubtype subtype = imi.getSubtypeAt(i);
-                if (!subtype.isAuxiliary()) {
-                    return false;
-                }
-            }
-        }
-        return true;
+        return imi.isAuxiliaryIme();
     }
 }