diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-17 11:05:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 11:06:21 -0700 |
| commit | b702e5df25a4537e8471d9b14c3cff4f3d2cb468 (patch) | |
| tree | 725684a70a5760f4d9dd880444ac242848a94982 | |
| parent | 25e1456ed8de57be3c551b39bf510dd0218a0d2b (diff) | |
| parent | ebaefec787ce09e715fc782f9fc2ba4556605e0e (diff) | |
| download | frameworks_base-b702e5df25a4537e8471d9b14c3cff4f3d2cb468.zip frameworks_base-b702e5df25a4537e8471d9b14c3cff4f3d2cb468.tar.gz frameworks_base-b702e5df25a4537e8471d9b14c3cff4f3d2cb468.tar.bz2 | |
Merge "Fix Bluetooth QS tile." into jb-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java | 6 |
1 files changed, 6 insertions, 0 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 56b9c3a..58e3a57 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -145,6 +145,7 @@ class QuickSettings { IntentFilter filter = new IntentFilter(); filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED); filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED); + filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); filter.addAction(Intent.ACTION_USER_SWITCHED); mContext.registerReceiver(mReceiver, filter); @@ -854,6 +855,11 @@ class QuickSettings { DisplayManager.EXTRA_WIFI_DISPLAY_STATUS); mWifiDisplayStatus = status; 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)) { int status = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE, BluetoothAdapter.STATE_DISCONNECTED); |