From bbf0b66edef9f3fe537dbf16fed6bd2e6651d9cf Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Sat, 10 Sep 2011 01:47:49 +0900 Subject: [PATCH] Suppress "Automatic" subtype name in tablet's IME switcher panel bug: 5282718 Change-Id: Ibecd6309eba9ac2fe173be7db4ba353e5821bd43 --- .../statusbar/tablet/InputMethodsPanel.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 5911378ea25b6..e406a0cf7b54e 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 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, 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);