diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-01 08:43:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-01 08:43:32 -0700 |
| commit | 17d5f47e5a1deb9a4fa09aee444a28ec3d1b1687 (patch) | |
| tree | fd4132bc654161690dbe64911d3d521c5f4b3ed0 | |
| parent | 79eda11f357e23f731fa85fc5d2b11ded5e91586 (diff) | |
| parent | dd68da887a87fdc193b67f4fb0bf407294cf2977 (diff) | |
| download | frameworks_base-17d5f47e5a1deb9a4fa09aee444a28ec3d1b1687.zip frameworks_base-17d5f47e5a1deb9a4fa09aee444a28ec3d1b1687.tar.gz frameworks_base-17d5f47e5a1deb9a4fa09aee444a28ec3d1b1687.tar.bz2 | |
Merge "Remove IME tile from Quick Settings." into jb-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java | 53 |
1 files 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) |