commit 38aac047431ea370509f956ad16224b39a71e586
author satok <satok@google.com> Tue Sep 06 14:41:33 2011 +0900
committer satok <satok@google.com> Tue Sep 06 14:41:33 2011 +0900
tree 282f999de682b9eeb93ac095944783df25920a13
parent 08b997c7421735252fa927d89f22ab6ceba0bff8

Do not show the label for auto subtypes

Change-Id: Ie62d0b83f2fcb2c93d3935bcaa5121d2adc56b7d

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 05a7eb2..ab70d6c 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -2100,8 +2100,10 @@
                         // We show all enabled IMEs and subtypes when an IME is shown.
                         if (enabledSubtypeSet.contains(subtypeHashCode)
                                 && ((mInputShown && !isScreenLocked) || !subtype.isAuxiliary())) {
-                            final CharSequence subtypeLabel = subtype.getDisplayName(context,
-                                    imi.getPackageName(), imi.getServiceInfo().applicationInfo);
+                            final CharSequence subtypeLabel =
+                                    subtype.overridesImplicitlyEnabledSubtype() ? null
+                                            : subtype.getDisplayName(context, imi.getPackageName(),
+                                                    imi.getServiceInfo().applicationInfo);
                             imList.add(new ImeSubtypeListItem(imeLabel, subtypeLabel, imi, j));
 
                             // Removing this subtype from enabledSubtypeSet because we no longer