From dd68da887a87fdc193b67f4fb0bf407294cf2977 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Mon, 1 Oct 2012 10:19:09 -0400 Subject: Remove IME tile from Quick Settings. It will remain a transient notification. Bug: 7246375 Change-Id: I34e262816c6f000d1ae64c41982ff9cc48e378e6 --- .../systemui/statusbar/phone/QuickSettings.java | 53 ++++++++++++---------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index 62ab297..d63d517 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -71,6 +71,7 @@ import java.util.ArrayList; * */ class QuickSettings { + public static final boolean SHOW_IME_TILE = false; private Context mContext; private PanelBar mBar; @@ -561,32 +562,34 @@ class QuickSettings { }); parent.addView(wifiDisplayTile); - // IME - QuickSettingsTileView imeTile = (QuickSettingsTileView) - inflater.inflate(R.layout.quick_settings_tile, parent, false); - imeTile.setContent(R.layout.quick_settings_tile_ime, inflater); - imeTile.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - mBar.collapseAllPanels(true); - Intent intent = new Intent(Settings.ACTION_SHOW_INPUT_METHOD_PICKER); - PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0); - pendingIntent.send(); - } catch (Exception e) {} - } - }); - mModel.addImeTile(imeTile, new QuickSettingsModel.RefreshCallback() { - @Override - public void refreshView(QuickSettingsTileView view, State state) { - TextView tv = (TextView) view.findViewById(R.id.ime_textview); - if (state.label != null) { - tv.setText(state.label); + if (SHOW_IME_TILE) { + // IME + QuickSettingsTileView imeTile = (QuickSettingsTileView) + inflater.inflate(R.layout.quick_settings_tile, parent, false); + imeTile.setContent(R.layout.quick_settings_tile_ime, inflater); + imeTile.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + try { + mBar.collapseAllPanels(true); + Intent intent = new Intent(Settings.ACTION_SHOW_INPUT_METHOD_PICKER); + PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0); + pendingIntent.send(); + } catch (Exception e) {} } - view.setVisibility(state.enabled ? View.VISIBLE : View.GONE); - } - }); - parent.addView(imeTile); + }); + mModel.addImeTile(imeTile, new QuickSettingsModel.RefreshCallback() { + @Override + public void refreshView(QuickSettingsTileView view, State state) { + TextView tv = (TextView) view.findViewById(R.id.ime_textview); + if (state.label != null) { + tv.setText(state.label); + } + view.setVisibility(state.enabled ? View.VISIBLE : View.GONE); + } + }); + parent.addView(imeTile); + } // Bug reports QuickSettingsTileView bugreportTile = (QuickSettingsTileView) -- cgit v1.1