summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bluetooth
Commit message (Collapse)AuthorAgeFilesLines
* Merge "b/2310373 Show pairing dialogs if the device has been scanning for bt ↵Michael Chan2010-03-032-4/+25
|\ | | | | | | devices recently."
| * b/2310373 Show pairing dialogs if the device has been scanning for bt ↵Michael Chan2010-03-032-4/+25
| | | | | | | | | | | | devices recently. Change-Id: Iec9eb37a5e79b63cc3cf226e2ead6d9ed06d56a6
* | b/2482585 Bluetooth settings: remove "Scan for devices" from menuMichael Chan2010-03-021-30/+0
|/ | | | Change-Id: I206794245a6afeb97366dd32e609f4e7f9374c20
* am 3a6b2df2: am 324ab848: Merge "b/2370089 Pop the dock dialog above the ↵Michael Chan2010-01-251-1/+1
|\ | | | | | | | | | | | | | | | | keyguard" into eclair Merge commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a' * commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a': b/2370089 Pop the dock dialog above the keyguard
| * b/2370089 Pop the dock dialog above the keyguardMichael Chan2010-01-201-1/+1
| | | | | | | | Change-Id: I958ac22defb057fd1ce98a711e3e92073588b1e8
* | am fcd4e7fe: am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not ↵Michael Chan2010-01-221-13/+46
|\ \ | |/ | | | | | | | | | | | | | | disabled if the phone was inserted and removed quickly." into eclair Merge commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c' * commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c': b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
| * b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and ↵Michael Chan2010-01-191-13/+46
| | | | | | | | | | | | removed quickly. Change-Id: Ifa721afa9c4a9d83a4dd70ed75f5d66ec06a01f6
* | am 97ed3f4b: am 3fe86a34: b/2332395 Disable BT when undocked if BT was off ↵Michael Chan2010-01-222-18/+132
|\ \ | |/ | | | | | | | | | | | | | | to at docking time unless if 1) the user has manually turned off bt while docked or 2) there\'s a connect device at the time we are ready to turn off bt Merge commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7' * commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7': b/2332395 Disable BT when undocked if BT was off to at docking time
| * b/2332395 Disable BT when undocked if BT was off to at docking timeMichael Chan2010-01-192-18/+132
| | | | | | | | | | | | | | unless if 1) the user has manually turned off bt while docked or 2) there's a connect device at the time we are ready to turn off bt Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
* | am 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect if the user turns on ↵Michael Chan2010-01-203-20/+79
|\ \ | |/ | | | | | | | | | | | | | | BT while docked." into eclair Merge commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48' * commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48': b/2367861 Auto connect if the user turns on BT while docked.
| * b/2367861 Auto connect if the user turns on BT while docked.Michael Chan2010-01-143-20/+79
| | | | | | | | Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
* | Settings: revise WifiEnabler and BluetoothEnabler.Chia-chi Yeh2010-01-151-82/+52
| | | | | | | | | | | | | | | | | | This mainly changes the way both enablers react to the airplane mode. Now enablers show a toast message instead of disabling the check box directly. This avoids the inconsistent state introduced by WirelessSettings which controls the check box using layout dependency. Related bug: 2053751
* | am d69a5ee2: am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.Michael Chan2010-01-121-11/+17
|\ \ | |/ | | | | | | | | | | Merge commit 'd69a5ee28cb5164233805a751a7c3deafba58668' * commit 'd69a5ee28cb5164233805a751a7c3deafba58668': b/2367020 Enable bt profiles by default for car dock.
| * b/2367020 Enable bt profiles by default for car dock.Michael Chan2010-01-121-11/+17
| | | | | | | | Change-Id: I95b1330ab432d38fb509321d843d04a41185d331
| * b/2335780 Fixed race conditions which causes BT to not be in the correct ↵Michael Chan2010-01-082-35/+15
| | | | | | | | | | | | state in respect to the dock state. DO NOT MERGE Change-Id: I02825cbde24ff0215787bb2d4f78cd6e7e1f4033
* | Merge "b/2335780 Fixed race conditions which causes BT to not be in the ↵Michael Chan2010-01-082-35/+15
|\ \ | | | | | | | | | correct state in respect to the dock state."
| * | b/2335780 Fixed race conditions which causes BT to not be in the correct ↵Michael Chan2010-01-082-35/+15
| |/ | | | | | | | | | | state in respect to the dock state. Change-Id: I4428708e02e7dcbb26795b0982cfe4389df60a46
* | Allow bluetooth in airplane mode when in "toggleable" list.Jeff Sharkey2009-12-221-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of radios that can be toggled while in airplane mode. This CL changes BluetoothEnabler to respect this. It parallels the logic in WifiEnabler, which enables OEMs to allow Wifi changes when in airplane mode. Most existing devices don't include "bluetooth" in the toggleable list, which means bluetooth will continue to be disabled when in airplane mode for those devices. Fixes http://b/2297314
* | am f4ec356d: am d8eec52a: b/2318290 connect should be called instead of ↵Michael Chan2009-12-211-4/+9
|\ \ | |/ | | | | | | | | | | | | | | connect(profile) if device is unpaired. Merge commit 'f4ec356df960245889da6f7518ec28c862ebf5e6' * commit 'f4ec356df960245889da6f7518ec28c862ebf5e6': b/2318290 connect should be called instead of connect(profile) if device is unpaired.
| * b/2318290 connect should be called instead of connect(profile) if device is ↵Michael Chan2009-12-171-4/+9
| | | | | | | | | | | | unpaired. Change-Id: I5d665d1c3149ffc77387f96c3822e80b84c78de1
* | am fcea8c0d: am 29d70e44: b/2334482 Disable Music and audio by default for ↵Michael Chan2009-12-171-2/+2
|\ \ | |/ | | | | | | | | | | | | | | the docks Merge commit 'fcea8c0d131e019e4441fa239720a5e4ecf9ed7d' * commit 'fcea8c0d131e019e4441fa239720a5e4ecf9ed7d': b/2334482 Disable Music and audio by default for the docks
| * b/2334482 Disable Music and audio by default for the docksMichael Chan2009-12-171-2/+2
| | | | | | | | Change-Id: I1d84cd1dfe54dd3ae4e9183a291cb8f3e0d5da5a
* | am 052ad242: b/2323277 Fixed race condition where the user clicks on the ↵Michael Chan2009-12-141-2/+4
|\ \ | |/ | | | | | | | | | | | | | | dialog before dismiss() is processed. Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-mr2 * commit '052ad24219bbb170d9d028a460741524a768915a': b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
| * b/2323277 Fixed race condition where the user clicks on the dialog before ↵Michael Chan2009-12-141-2/+4
| | | | | | | | | | | | dismiss() is processed. Change-Id: Iae98c45e4c1c5d36f33d6519ee2adba515f6b9aa
* | am 9463c2f8: b/2320107 NPE when receiving a Undock event without a deviceMichael Chan2009-12-101-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-mr2 * commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a': b/2320107 NPE when receiving a Undock event without a device
| * b/2320107 NPE when receiving a Undock event without a deviceMichael Chan2009-12-101-1/+1
| | | | | | | | Change-Id: Ic3c964f2d58462a1b7c82f2de2dd997679f90ba7
* | am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.Michael Chan2009-12-102-17/+22
|\ \ | |/ | | | | | | | | | | Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-mr2 * commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef': b/2320107 Fixed NPE for class bits. Docks do not have class bits.
| * b/2320107 Fixed NPE for class bits. Docks do not have class bits.Michael Chan2009-12-102-17/+22
| | | | | | | | Change-Id: Ibe4f697a906010f8f3ee270b891db286a4976f8a
* | am 613549a6: Merge change I2c3621d1 into eclairJaikumar Ganesh2009-12-102-1/+11
|\ \ | |/ | | | | | | | | | | Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-mr2 * commit '613549a622eac8278c9f81a1df83484c256652bf': Fix desk dock getting stuck after unpairing.
| * Merge change I2c3621d1 into eclairAndroid (Google) Code Review2009-12-102-1/+11
| |\ | | | | | | | | | | | | * changes: Fix desk dock getting stuck after unpairing.
| | * Fix desk dock getting stuck after unpairing.Jaikumar Ganesh2009-12-102-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: This is a workaround. The read problem is that we are making a call to Bluez when it is not ready yet. The interface has not been registered, so dbus call should fail. We need to fix this properly. Dr No: Eastham Bug: 2317784
* | | am d1469da1: Merge change I10036c49 into eclairMichael Chan2009-12-102-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd1469da150f44415135d657d57592f066670b317' into eclair-mr2 * commit 'd1469da150f44415135d657d57592f066670b317': b/2296110 Disable debugging/logging code before shipping.
| * | Merge change I10036c49 into eclairAndroid (Google) Code Review2009-12-102-2/+2
| |\ \ | | |/ | |/| | | | | | | * changes: b/2296110 Disable debugging/logging code before shipping.
| | * b/2296110 Disable debugging/logging code before shipping.Michael Chan2009-12-092-2/+2
| | | | | | | | | | | | Change-Id: I10036c49e3c3d61d0fa1af74f1f0cd9d03502103
* | | am 6e3ee10a: Fix auto connection of A2DP profile.Jaikumar Ganesh2009-12-101-4/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-mr2 * commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5': Fix auto connection of A2DP profile.
| * | Fix auto connection of A2DP profile.Jaikumar Ganesh2009-12-091-4/+14
| |/ | | | | | | | | | | | | When the user selects profiles from the UI, set priority to ON. Dr No: Eastham Bug: 2317323
* | am d70e205b: Merge change I724fc8fd into eclairMichael Chan2009-12-101-3/+3
|\ \ | |/ | | | | | | | | | | Merge commit 'd70e205b4c6dbf9661b972aa208d5a42927bdd88' into eclair-mr2 * commit 'd70e205b4c6dbf9661b972aa208d5a42927bdd88': b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
| * Merge change I724fc8fd into eclairAndroid (Google) Code Review2009-12-091-3/+3
| |\ | | | | | | | | | | | | * changes: b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
| | * b/2317194 Synchronize command queue to prevent ↵Michael Chan2009-12-091-3/+3
| | | | | | | | | | | | | | | | | | ConcurrentModificationException from happening Change-Id: I724fc8fd07d33cfa6e68221a766754dcb1f6aeba
* | | am 1d5f14bd: Merge change I92124d28 into eclairMichael Chan2009-12-102-14/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-mr2 * commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda': b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
| * | b/2296110 Car Dock - Stop service when done processing each command. Clean ↵Michael Chan2009-12-092-14/+9
| | | | | | | | | | | | | | | | | | up logs. Change-Id: I92124d2856e6c825a2b4148473431789a1f5b156
* | | am 488a80a7: Merge change Id587a517 into eclairMichael Chan2009-12-103-30/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-mr2 * commit '488a80a7b111f5906bf51101785a95a6c640d265': b/2314560 Prevent PIN dialog from showing up on undocked docks
| * | b/2314560 Prevent PIN dialog from showing up on undocked docksMichael Chan2009-12-093-30/+76
| |/ | | | | | | | | | | | | | | If unpaired while undocked, device will be removed from the BT device list. If unpaired while docked, the user can do pair and connect. No PIN dialog will pop up. If undocked after unpaired, device will be removed from the BT device list. Change-Id: Id587a517999e08641451f78dec8696a06028cf16
* | am 14638566: b/2296110 Car Dock - Enable BT if not already enabled.Michael Chan2009-12-082-35/+90
|\ \ | |/ | | | | | | | | | | Merge commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8' into eclair-mr2 * commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8': b/2296110 Car Dock - Enable BT if not already enabled.
| * b/2296110 Car Dock - Enable BT if not already enabled.Michael Chan2009-12-082-35/+90
| | | | | | | | Change-Id: If1798f62c9438e58c342869176437067f941c8cb
* | am 0c75b2d2: Merge change I80790bdb into eclairMichael Chan2009-12-075-419/+640
|\ \ | |/ | | | | | | | | | | Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-mr2 * commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350': b/2296110 Dialog for setting up dock audio.
| * Merge change I80790bdb into eclairAndroid (Google) Code Review2009-12-075-419/+640
| |\ | | | | | | | | | | | | * changes: b/2296110 Dialog for setting up dock audio.
| | * b/2296110 Dialog for setting up dock audio.Michael Chan2009-12-075-419/+640
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reimplemented as a Foreground Service just so it can get on top of the Car Dock App. Added debounce mechanism to not disconnect immediately after getting a undock event. Each dock now has its own "Remember setting". Remember Settings is on by default Change-Id: I80790bdb7c831e2a642365b92433012191aa70c1
* | | am 55dc6cb9: Disconnect even Sinks in Connecting state while connecting ↵Jaikumar Ganesh2009-12-071-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | another sink. Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-mr2 * commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5': Disconnect even Sinks in Connecting state while connecting another sink.
| * | Disconnect even Sinks in Connecting state while connecting another sink.Jaikumar Ganesh2009-12-071-2/+2
| |/ | | | | | | | | | | | | We can hit this more when using a Car Dock Bug: 2133530 Dr No: Eastham
generated by cgit v1.1 at 2024-11-18 23:12:05 +0000