From 6ea661863daff6907ac7205e12c081b0ad3bdb22 Mon Sep 17 00:00:00 2001 From: satok Date: Thu, 4 Nov 2010 20:57:38 +0900 Subject: [PATCH] Change API for input method subtype's mode from resource id to String Change-Id: Ibf053d1747337cce3829288c6a47782f4dee9522 --- .../settings/inputmethod/InputMethodAndSubtypeEnabler.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index f40b008a49e..3659dbbf623 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -199,11 +199,8 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment { 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);