commit 6ea661863daff6907ac7205e12c081b0ad3bdb22
author satok <satok@google.com> Thu Nov 04 20:57:38 2010 +0900
committer satok <satok@google.com> Fri Nov 05 11:44:36 2010 +0900
tree bc3a2f384f95b97dfece4e2c49c5c3c67a328ab5
parent 69afd73f8785bde00fc428431b72b9c2f97031ff

Change API for input method subtype's mode from resource id to String

Change-Id: Ibf053d1747337cce3829288c6a47782f4dee9522

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

diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index f40b008..3659dbb 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -199,11 +199,8 @@
                         subtypeLabel = pm.getText(property.getPackageName(), nameResId,
                                 property.getServiceInfo().applicationInfo);
                     } else {
-                        int modeResId = subtype.getModeResId();
+                        String mode = subtype.getMode();
                         CharSequence language = subtype.getLocale();
-                        CharSequence mode = modeResId == 0 ? null
-                                : pm.getText(property.getPackageName(), modeResId,
-                                        property.getServiceInfo().applicationInfo);
                         // TODO: Use more friendly Title and UI
                         subtypeLabel = (mode == null ? "" : mode) + ","
                                 + (language == null ? "" : language);