Skip to content

Commit bbf0b66

Browse files
author
Ken Wakasa
committed
Suppress "Automatic" subtype name in tablet's IME switcher panel
bug: 5282718 Change-Id: Ibecd6309eba9ac2fe173be7db4ba353e5821bd43
1 parent ce00275 commit bbf0b66

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,15 +218,16 @@ private void showConfigureInputMethods() {
218218

219219
private View createInputMethodItem(
220220
final InputMethodInfo imi, final InputMethodSubtype subtype) {
221-
CharSequence subtypeName = getSubtypeName(imi, subtype);
222-
CharSequence imiName = getIMIName(imi);
223-
Drawable icon = getSubtypeIcon(imi, subtype);
224-
View view = View.inflate(mContext, R.layout.status_bar_input_methods_item, null);
225-
ImageView subtypeIcon = (ImageView)view.findViewById(R.id.item_icon);
226-
TextView itemTitle = (TextView)view.findViewById(R.id.item_title);
227-
TextView itemSubtitle = (TextView)view.findViewById(R.id.item_subtitle);
228-
ImageView settingsIcon = (ImageView)view.findViewById(R.id.item_settings_icon);
229-
View subtypeView = view.findViewById(R.id.item_subtype);
221+
final CharSequence subtypeName = subtype.overridesImplicitlyEnabledSubtype()
222+
? null : getSubtypeName(imi, subtype);
223+
final CharSequence imiName = getIMIName(imi);
224+
final Drawable icon = getSubtypeIcon(imi, subtype);
225+
final View view = View.inflate(mContext, R.layout.status_bar_input_methods_item, null);
226+
final ImageView subtypeIcon = (ImageView)view.findViewById(R.id.item_icon);
227+
final TextView itemTitle = (TextView)view.findViewById(R.id.item_title);
228+
final TextView itemSubtitle = (TextView)view.findViewById(R.id.item_subtitle);
229+
final ImageView settingsIcon = (ImageView)view.findViewById(R.id.item_settings_icon);
230+
final View subtypeView = view.findViewById(R.id.item_subtype);
230231
if (subtypeName == null) {
231232
itemTitle.setText(imiName);
232233
itemSubtitle.setVisibility(View.GONE);

0 commit comments

Comments
 (0)