Skip to content

Commit 17d5f47

Browse files
dsandlerAndroid (Google) Code Review
authored andcommitted
Merge "Remove IME tile from Quick Settings." into jb-mr1-dev
2 parents 79eda11 + dd68da8 commit 17d5f47

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
*
7272
*/
7373
class QuickSettings {
74+
public static final boolean SHOW_IME_TILE = false;
7475

7576
private Context mContext;
7677
private PanelBar mBar;
@@ -561,32 +562,34 @@ public void refreshView(QuickSettingsTileView view, State state) {
561562
});
562563
parent.addView(wifiDisplayTile);
563564

564-
// IME
565-
QuickSettingsTileView imeTile = (QuickSettingsTileView)
566-
inflater.inflate(R.layout.quick_settings_tile, parent, false);
567-
imeTile.setContent(R.layout.quick_settings_tile_ime, inflater);
568-
imeTile.setOnClickListener(new View.OnClickListener() {
569-
@Override
570-
public void onClick(View v) {
571-
try {
572-
mBar.collapseAllPanels(true);
573-
Intent intent = new Intent(Settings.ACTION_SHOW_INPUT_METHOD_PICKER);
574-
PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
575-
pendingIntent.send();
576-
} catch (Exception e) {}
577-
}
578-
});
579-
mModel.addImeTile(imeTile, new QuickSettingsModel.RefreshCallback() {
580-
@Override
581-
public void refreshView(QuickSettingsTileView view, State state) {
582-
TextView tv = (TextView) view.findViewById(R.id.ime_textview);
583-
if (state.label != null) {
584-
tv.setText(state.label);
565+
if (SHOW_IME_TILE) {
566+
// IME
567+
QuickSettingsTileView imeTile = (QuickSettingsTileView)
568+
inflater.inflate(R.layout.quick_settings_tile, parent, false);
569+
imeTile.setContent(R.layout.quick_settings_tile_ime, inflater);
570+
imeTile.setOnClickListener(new View.OnClickListener() {
571+
@Override
572+
public void onClick(View v) {
573+
try {
574+
mBar.collapseAllPanels(true);
575+
Intent intent = new Intent(Settings.ACTION_SHOW_INPUT_METHOD_PICKER);
576+
PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
577+
pendingIntent.send();
578+
} catch (Exception e) {}
585579
}
586-
view.setVisibility(state.enabled ? View.VISIBLE : View.GONE);
587-
}
588-
});
589-
parent.addView(imeTile);
580+
});
581+
mModel.addImeTile(imeTile, new QuickSettingsModel.RefreshCallback() {
582+
@Override
583+
public void refreshView(QuickSettingsTileView view, State state) {
584+
TextView tv = (TextView) view.findViewById(R.id.ime_textview);
585+
if (state.label != null) {
586+
tv.setText(state.label);
587+
}
588+
view.setVisibility(state.enabled ? View.VISIBLE : View.GONE);
589+
}
590+
});
591+
parent.addView(imeTile);
592+
}
590593

591594
// Bug reports
592595
QuickSettingsTileView bugreportTile = (QuickSettingsTileView)

0 commit comments

Comments
 (0)