commit 81f6e3d8d214a8ffadb6bae63b705602fe165156
author Ken Wakasa <kwakasa@google.com> Fri Mar 04 09:59:52 2011 +0900
committer Ken Wakasa <kwakasa@google.com> Fri Mar 04 09:59:52 2011 +0900
tree 277221e1567750f4d916839e7581ec199d05734e
parent 6c8d76527c938eb49182a6fd0677ccbc1618e7a8

Append IME's name to the subtype name in the "Select input method" dialog

bug: 3364167
Change-Id: I79b5435ec457e9e71ae69dbfaad8e719db6ff6d3

services/java/com/android/server/InputMethodManagerService.java

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 44b8590..f2cf942 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1761,7 +1761,7 @@
                     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 @@
                             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