summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Merge "b/2310373 Show pairing dialogs if the device has been scanning for bt ...Michael Chan2010-03-032-4/+25
|\
| * b/2310373 Show pairing dialogs if the device has been scanning for bt devices...Michael Chan2010-03-032-4/+25
* | b/2482585 Bluetooth settings: remove "Scan for devices" from menuMichael Chan2010-03-021-30/+0
|/
* am 3a6b2df2: am 324ab848: Merge "b/2370089 Pop the dock dialog above the keyg...Michael Chan2010-01-251-1/+1
|\
| * b/2370089 Pop the dock dialog above the keyguardMichael Chan2010-01-201-1/+1
* | am fcd4e7fe: am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not disabl...Michael Chan2010-01-221-13/+46
|\ \ | |/
| * b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and ...Michael Chan2010-01-191-13/+46
* | am 97ed3f4b: am 3fe86a34: b/2332395 Disable BT when undocked if BT was off to...Michael Chan2010-01-222-18/+132
|\ \ | |/
| * b/2332395 Disable BT when undocked if BT was off to at docking timeMichael Chan2010-01-192-18/+132
* | am 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect if the user turns on ...Michael Chan2010-01-203-20/+79
|\ \ | |/
| * b/2367861 Auto connect if the user turns on BT while docked.Michael Chan2010-01-143-20/+79
* | Settings: revise WifiEnabler and BluetoothEnabler.Chia-chi Yeh2010-01-151-82/+52
* | am d69a5ee2: am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.Michael Chan2010-01-121-11/+17
|\ \ | |/
| * b/2367020 Enable bt profiles by default for car dock.Michael Chan2010-01-121-11/+17
| * b/2335780 Fixed race conditions which causes BT to not be in the correct stat...Michael Chan2010-01-082-35/+15
* | Merge "b/2335780 Fixed race conditions which causes BT to not be in the corre...Michael Chan2010-01-082-35/+15
|\ \
| * | b/2335780 Fixed race conditions which causes BT to not be in the correct stat...Michael Chan2010-01-082-35/+15
| |/
* | Allow bluetooth in airplane mode when in "toggleable" list.Jeff Sharkey2009-12-221-20/+22
* | am f4ec356d: am d8eec52a: b/2318290 connect should be called instead of conne...Michael Chan2009-12-211-4/+9
|\ \ | |/
| * b/2318290 connect should be called instead of connect(profile) if device is u...Michael Chan2009-12-171-4/+9
* | am fcea8c0d: am 29d70e44: b/2334482 Disable Music and audio by default for th...Michael Chan2009-12-171-2/+2
|\ \ | |/
| * b/2334482 Disable Music and audio by default for the docksMichael Chan2009-12-171-2/+2
* | am 052ad242: b/2323277 Fixed race condition where the user clicks on the dial...Michael Chan2009-12-141-2/+4
|\ \ | |/
| * b/2323277 Fixed race condition where the user clicks on the dialog before dis...Michael Chan2009-12-141-2/+4
* | am 9463c2f8: b/2320107 NPE when receiving a Undock event without a deviceMichael Chan2009-12-101-1/+1
|\ \ | |/
| * b/2320107 NPE when receiving a Undock event without a deviceMichael Chan2009-12-101-1/+1
* | am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.Michael Chan2009-12-102-17/+22
|\ \ | |/
| * b/2320107 Fixed NPE for class bits. Docks do not have class bits.Michael Chan2009-12-102-17/+22
* | am 613549a6: Merge change I2c3621d1 into eclairJaikumar Ganesh2009-12-102-1/+11
|\ \ | |/
| * Merge change I2c3621d1 into eclairAndroid (Google) Code Review2009-12-102-1/+11
| |\
| | * Fix desk dock getting stuck after unpairing.Jaikumar Ganesh2009-12-102-1/+11
* | | am d1469da1: Merge change I10036c49 into eclairMichael Chan2009-12-102-2/+2
|\ \ \ | |/ /
| * | Merge change I10036c49 into eclairAndroid (Google) Code Review2009-12-102-2/+2
| |\ \ | | |/ | |/|
| | * b/2296110 Disable debugging/logging code before shipping.Michael Chan2009-12-092-2/+2
* | | am 6e3ee10a: Fix auto connection of A2DP profile.Jaikumar Ganesh2009-12-101-4/+14
|\ \ \ | |/ /
| * | Fix auto connection of A2DP profile.Jaikumar Ganesh2009-12-091-4/+14
| |/
* | am d70e205b: Merge change I724fc8fd into eclairMichael Chan2009-12-101-3/+3
|\ \ | |/
| * Merge change I724fc8fd into eclairAndroid (Google) Code Review2009-12-091-3/+3
| |\
| | * b/2317194 Synchronize command queue to prevent ConcurrentModificationExceptio...Michael Chan2009-12-091-3/+3
* | | am 1d5f14bd: Merge change I92124d28 into eclairMichael Chan2009-12-102-14/+9
|\ \ \ | |/ /
| * | b/2296110 Car Dock - Stop service when done processing each command. Clean up...Michael Chan2009-12-092-14/+9
* | | am 488a80a7: Merge change Id587a517 into eclairMichael Chan2009-12-103-30/+76
|\ \ \ | |/ /
| * | b/2314560 Prevent PIN dialog from showing up on undocked docksMichael Chan2009-12-093-30/+76
| |/
* | am 14638566: b/2296110 Car Dock - Enable BT if not already enabled.Michael Chan2009-12-082-35/+90
|\ \ | |/
| * b/2296110 Car Dock - Enable BT if not already enabled.Michael Chan2009-12-082-35/+90
* | am 0c75b2d2: Merge change I80790bdb into eclairMichael Chan2009-12-075-419/+640
|\ \ | |/
| * Merge change I80790bdb into eclairAndroid (Google) Code Review2009-12-075-419/+640
| |\
| | * b/2296110 Dialog for setting up dock audio.Michael Chan2009-12-075-419/+640
* | | am 55dc6cb9: Disconnect even Sinks in Connecting state while connecting anoth...Jaikumar Ganesh2009-12-071-2/+2
|\ \ \ | |/ /
| * | Disconnect even Sinks in Connecting state while connecting another sink.Jaikumar Ganesh2009-12-071-2/+2
| |/