Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev

Browse Source 
* commit 'b702e5df25a4537e8471d9b14c3cff4f3d2cb468':
  Fix Bluetooth QS tile.
This commit is contained in:
Daniel Sandler
2012-10-17 11:08:04 -07:00
committed by Android Git Automerger
parent f78a2353af b702e5df25
commit 85b882f5a5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
View File

@@ -145,6 +145,7 @@ class QuickSettings {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED); filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED); filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);
filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
filter.addAction(Intent.ACTION_USER_SWITCHED); filter.addAction(Intent.ACTION_USER_SWITCHED);
mContext.registerReceiver(mReceiver, filter); mContext.registerReceiver(mReceiver, filter);
@@ -854,6 +855,11 @@ class QuickSettings {
DisplayManager.EXTRA_WIFI_DISPLAY_STATUS); DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);
mWifiDisplayStatus = status; mWifiDisplayStatus = status;
applyWifiDisplayStatus(); applyWifiDisplayStatus();
} else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
BluetoothAdapter.ERROR);
mBluetoothState.enabled = (state == BluetoothAdapter.STATE_ON);
applyBluetoothStatus();
} else if (BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED.equals(action)) { } else if (BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED.equals(action)) {
int status = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE, int status = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE,
BluetoothAdapter.STATE_DISCONNECTED); BluetoothAdapter.STATE_DISCONNECTED);