am 17d5f47e: Merge "Remove IME tile from Quick Settings." into jb-mr1-dev

* commit '17d5f47e5a1deb9a4fa09aee444a28ec3d1b1687':
  Remove IME tile from Quick Settings.
This commit is contained in:
Daniel Sandler
2012-10-01 10:12:44 -07:00
committed by Android Git Automerger

View File

@@ -71,6 +71,7 @@ import java.util.ArrayList;
* *
*/ */
class QuickSettings { class QuickSettings {
public static final boolean SHOW_IME_TILE = false;
private Context mContext; private Context mContext;
private PanelBar mBar; private PanelBar mBar;
@@ -561,32 +562,34 @@ class QuickSettings {
}); });
parent.addView(wifiDisplayTile); parent.addView(wifiDisplayTile);
// IME if (SHOW_IME_TILE) {
QuickSettingsTileView imeTile = (QuickSettingsTileView) // IME
inflater.inflate(R.layout.quick_settings_tile, parent, false); QuickSettingsTileView imeTile = (QuickSettingsTileView)
imeTile.setContent(R.layout.quick_settings_tile_ime, inflater); inflater.inflate(R.layout.quick_settings_tile, parent, false);
imeTile.setOnClickListener(new View.OnClickListener() { imeTile.setContent(R.layout.quick_settings_tile_ime, inflater);
@Override imeTile.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { @Override
try { public void onClick(View v) {
mBar.collapseAllPanels(true); try {
Intent intent = new Intent(Settings.ACTION_SHOW_INPUT_METHOD_PICKER); mBar.collapseAllPanels(true);
PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0); Intent intent = new Intent(Settings.ACTION_SHOW_INPUT_METHOD_PICKER);
pendingIntent.send(); PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
} catch (Exception e) {} 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);
} }
view.setVisibility(state.enabled ? View.VISIBLE : View.GONE); });
} mModel.addImeTile(imeTile, new QuickSettingsModel.RefreshCallback() {
}); @Override
parent.addView(imeTile); 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 // Bug reports
QuickSettingsTileView bugreportTile = (QuickSettingsTileView) QuickSettingsTileView bugreportTile = (QuickSettingsTileView)