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

Change-Id: Ibf053d1747337cce3829288c6a47782f4dee9522
This commit is contained in:
satok
2010-11-04 20:57:38 +09:00
parent 69afd73f87
commit 6ea661863d

View File

@@ -199,11 +199,8 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
subtypeLabel = pm.getText(property.getPackageName(), nameResId, subtypeLabel = pm.getText(property.getPackageName(), nameResId,
property.getServiceInfo().applicationInfo); property.getServiceInfo().applicationInfo);
} else { } else {
int modeResId = subtype.getModeResId(); String mode = subtype.getMode();
CharSequence language = subtype.getLocale(); CharSequence language = subtype.getLocale();
CharSequence mode = modeResId == 0 ? null
: pm.getText(property.getPackageName(), modeResId,
property.getServiceInfo().applicationInfo);
// TODO: Use more friendly Title and UI // TODO: Use more friendly Title and UI
subtypeLabel = (mode == null ? "" : mode) + "," subtypeLabel = (mode == null ? "" : mode) + ","
+ (language == null ? "" : language); + (language == null ? "" : language);