diff options
| author | satok <satok@google.com> | 2010-11-04 20:57:38 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-11-05 11:44:36 +0900 |
| commit | 6ea661863daff6907ac7205e12c081b0ad3bdb22 (patch) | |
| tree | bc3a2f384f95b97dfece4e2c49c5c3c67a328ab5 /src/com/android/settings | |
| parent | 69afd73f8785bde00fc428431b72b9c2f97031ff (diff) | |
| download | packages_apps_settings-6ea661863daff6907ac7205e12c081b0ad3bdb22.zip packages_apps_settings-6ea661863daff6907ac7205e12c081b0ad3bdb22.tar.gz packages_apps_settings-6ea661863daff6907ac7205e12c081b0ad3bdb22.tar.bz2 | |
Change API for input method subtype's mode from resource id to String
Change-Id: Ibf053d1747337cce3829288c6a47782f4dee9522
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java | 5 |
1 files changed, 1 insertions, 4 deletions
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 @@ 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); |