diff options
author | Daniel Sandler <dsandler@android.com> | 2012-10-17 11:37:42 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2012-10-17 11:38:44 -0400 |
commit | ebaefec787ce09e715fc782f9fc2ba4556605e0e (patch) | |
tree | 9fb44689fbd382ebdee6ee58e56d44a968e62450 /packages/SystemUI/src/com/android | |
parent | 91ffeddb8b6ceec9a18ae34f88bd56560335de7f (diff) | |
download | frameworks_base-ebaefec787ce09e715fc782f9fc2ba4556605e0e.zip frameworks_base-ebaefec787ce09e715fc782f9fc2ba4556605e0e.tar.gz frameworks_base-ebaefec787ce09e715fc782f9fc2ba4556605e0e.tar.bz2 |
Fix Bluetooth QS tile.
Changes in the connection state were causing QuickSettings
to clobber the enabled state of the adapter.
Bug: 7365388
Change-Id: I9611cb492d143bc9e7246c3e210664705586a85d
Diffstat (limited to 'packages/SystemUI/src/com/android')
-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); |