commit bbf0b66edef9f3fe537dbf16fed6bd2e6651d9cf
author Ken Wakasa <kwakasa@google.com> Sat Sep 10 01:47:49 2011 +0900
committer Ken Wakasa <kwakasa@google.com> Sat Sep 10 01:47:49 2011 +0900
tree 7ae47dabd3668295ffc6f6b878bb0a1b4971ab52
parent ce0027532dc10bf9b25f4eeff1a7540f10fe9a26

Suppress "Automatic" subtype name in tablet's IME switcher panel

bug: 5282718
Change-Id: Ibecd6309eba9ac2fe173be7db4ba353e5821bd43

packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
index 5911378..e406a0c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
@@ -218,15 +218,16 @@
 
     private View createInputMethodItem(
             final InputMethodInfo imi, final InputMethodSubtype subtype) {
-        CharSequence subtypeName = getSubtypeName(imi, subtype);
-        CharSequence imiName = getIMIName(imi);
-        Drawable icon = getSubtypeIcon(imi, subtype);
-        View view = View.inflate(mContext, R.layout.status_bar_input_methods_item, null);
-        ImageView subtypeIcon = (ImageView)view.findViewById(R.id.item_icon);
-        TextView itemTitle = (TextView)view.findViewById(R.id.item_title);
-        TextView itemSubtitle = (TextView)view.findViewById(R.id.item_subtitle);
-        ImageView settingsIcon = (ImageView)view.findViewById(R.id.item_settings_icon);
-        View subtypeView = view.findViewById(R.id.item_subtype);
+        final CharSequence subtypeName = subtype.overridesImplicitlyEnabledSubtype()
+                ? null : getSubtypeName(imi, subtype);
+        final CharSequence imiName = getIMIName(imi);
+        final Drawable icon = getSubtypeIcon(imi, subtype);
+        final View view = View.inflate(mContext, R.layout.status_bar_input_methods_item, null);
+        final ImageView subtypeIcon = (ImageView)view.findViewById(R.id.item_icon);
+        final TextView itemTitle = (TextView)view.findViewById(R.id.item_title);
+        final TextView itemSubtitle = (TextView)view.findViewById(R.id.item_subtitle);
+        final ImageView settingsIcon = (ImageView)view.findViewById(R.id.item_settings_icon);
+        final View subtypeView = view.findViewById(R.id.item_subtype);
         if (subtypeName == null) {
             itemTitle.setText(imiName);
             itemSubtitle.setVisibility(View.GONE);