Merge "More migration to Global settings." into jb-mr1-dev

This commit is contained in:
Jeff Sharkey
2012-10-18 23:23:07 -07:00
committed by Android (Google) Code Review
4 changed files with 15 additions and 15 deletions

View File

@@ -108,7 +108,7 @@ public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeLis
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
// Show toast message if Bluetooth is not allowed in airplane mode
if (isChecked &&
!WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_BLUETOOTH)) {
!WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_BLUETOOTH)) {
Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
// Reset switch to off
buttonView.setChecked(false);