Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select input method" dialog" into honeycomb-mr1

Browse Source 
* commit 'a7001ee8b60d66c25de69c8496108c40a0f2df88':
  Append IME's name to the subtype name in the "Select input method" dialog
This commit is contained in:
Ken Wakasa
2011-03-04 00:16:16 -08:00
committed by Android Git Automerger
parent 47ffa46167 a7001ee8b6
commit 1b3f178f85
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -1761,7 +1761,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
enabledSubtypeSet.add(String.valueOf(subtype.hashCode()));
}
ArrayList<InputMethodSubtype> subtypes = getSubtypes(imi);
CharSequence label = imi.loadLabel(pm);
final CharSequence label = imi.loadLabel(pm);
if (showSubtypes && enabledSubtypeSet.size() > 0) {
final int subtypeCount = imi.getSubtypeCount();
for (int j = 0; j < subtypeCount; ++j) {
@@ -1771,8 +1771,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
int nameResId = subtype.getNameResId();
String mode = subtype.getMode();
if (nameResId != 0) {
title = pm.getText(imi.getPackageName(), nameResId,
imi.getServiceInfo().applicationInfo);
title = TextUtils.concat(pm.getText(imi.getPackageName(),
nameResId, imi.getServiceInfo().applicationInfo),
" (", label, ")");
} else {
CharSequence language = subtype.getLocale();
// TODO: Use more friendly Title and UI