PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 36db0471: am 6e0bff0d: Merge "Fix the message when Bluetooth is turning off while on the tethering menu."

Browse Source 
* commit '36db0471bd7240a7d9d5274a1e1933259cd453e6':
  Fix the message when Bluetooth is turning off while on the tethering menu.
This commit is contained in:
Amith Yamasani
2013-03-08 18:39:06 +00:00
committed by Android Git Automerger
parent c0adf60318 36db0471bd
commit 4793e5d57b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/TetherSettings.java
View File

@@ -388,7 +388,7 @@ public class TetherSettings extends SettingsPreferenceFragment
int btState = adapter.getState(); int btState = adapter.getState();
if (btState == BluetoothAdapter.STATE_TURNING_OFF) { if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
mBluetoothTether.setEnabled(false); mBluetoothTether.setEnabled(false);
mBluetoothTether.setSummary(R.string.wifi_stopping); mBluetoothTether.setSummary(R.string.bluetooth_turning_off);
} else if (btState == BluetoothAdapter.STATE_TURNING_ON) { } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
mBluetoothTether.setEnabled(false); mBluetoothTether.setEnabled(false);
mBluetoothTether.setSummary(R.string.bluetooth_turning_on); mBluetoothTether.setSummary(R.string.bluetooth_turning_on);