summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge change I5bc2e0ed into eclair-mr2Android (Google) Code Review2009-12-111-0/+85
|\ \ | | | | | | | | | | | | * changes: Add Traditional Chinese versions of the time zone names.
| * | Add Traditional Chinese versions of the time zone names.Eric Fischer2009-12-101-0/+85
| | | | | | | | | | | | http://b/issue?id=2291444
* | | 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 e273289c: (-s ours) Merge change Ic0ce5c9a into eclairEric Fischer2009-12-100-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-mr2 * commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8': Import revised translations. DO NOT MERGE
| * | | Merge change Ic0ce5c9a into eclairAndroid (Google) Code Review2009-12-0920-75/+193
| |\ \ \ | | |/ / | |/| | | | | | | | | | * changes: Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2009-12-0920-75/+193
| | | |
* | | | 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-103-25/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-mr2 * commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda': b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
| * | | Merge change I92124d28 into eclairAndroid (Google) Code Review2009-12-093-25/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: 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-093-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge change Id587a517 into eclairAndroid (Google) Code Review2009-12-093-30/+76
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * changes: 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 a9f9031b: (-s ours) Display icons in the correct density in the ↵Romain Guy2009-12-100-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActivityPicker. This also fixes a memory leak in Home. Merge commit 'a9f9031ba35433a7e009da6099b17cf603372a70' into eclair-mr2 * commit 'a9f9031ba35433a7e009da6099b17cf603372a70': Display icons in the correct density in the ActivityPicker.
| * | | Display icons in the correct density in the ActivityPicker.Romain Guy2009-12-091-28/+34
| |/ / | | | | | | | | | | | | | | | | | | | | | This also fixes a memory leak in Home. Do not merge. Change-Id: Ib69b4055fae2c8705887bbd12be7fa61b689eb03
* | | Wifi diagnostic app to enable debug and provide informationIrfan Sheriff2009-12-1011-0/+1034
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | This is the first checkin on the wifi diagnostic app. Right now, it supports using the WifiManager API, shows the configuration details and provides status on the supplicant, network and wifi state along with some additional details. More to come: - add more API and status on any additional fields - provide a way to show some logs Bug: 2302130
* | Merge change Ib5077943 into eclair-mr2Android (Google) Code Review2009-12-091-0/+1
|\ \ | | | | | | | | | | | | * changes: Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
| * | Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFOBjorn Bringert2009-12-091-0/+1
| | | | | | | | | | | | | | | | | | Fixes http://b/issue?id=2315370 Change-Id: Ib5077943f40e66f1d6d4121416d0a36f7bdcfc9d
* | | Display icons in the correct density in the ActivityPicker.Romain Guy2009-12-091-28/+34
|/ /
* | 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-078-452/+666
|\ \ | |/ | | | | | | | | | | 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-078-452/+666
| |\ | | | | | | | | | | | | * changes: b/2296110 Dialog for setting up dock audio.
| | * b/2296110 Dialog for setting up dock audio.Michael Chan2009-12-078-452/+666
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.Michael Chan2009-12-038-23/+479
|\ \ | |/ | | | | | | | | | | Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-mr2 * commit '0bd445b974292dc3910b6bb85dcee7e7c378968f': b/2296110 New Dialog which appears when phone is place on dock.
| * b/2296110 New Dialog which appears when phone is place on dock.Michael Chan2009-12-038-23/+479
| | | | | | | | Change-Id: I58b216ee9b4ca9ce16210309358c0512271e128e
* | am 3327f788: b/2293042 Fixed the problem where A2DP connections may fail if ↵Michael Chan2009-12-032-3/+45
|\ \ | |/ | | | | | | | | | | | | | | there\'s an existing connection to another device. Merge commit '3327f7887328c55ef2d837a8e2a07cea2070c744' into eclair-mr2 * commit '3327f7887328c55ef2d837a8e2a07cea2070c744': b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
| * b/2293042 Fixed the problem where A2DP connections may fail if there's an ↵Michael Chan2009-12-032-3/+45
| | | | | | | | | | | | existing connection to another device. Change-Id: I1b4963a167b633c0905e2719ab3f651ff8be9f2c
* | am 9f1d9c16: (-s ours) Merge change I9a1ed7e4 into eclairJaikumar Ganesh2009-12-020-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-mr2 * commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48': Update to reflect new priorities for A2DP profile. DO NOT MERGE.
| * Merge change I9a1ed7e4 into eclairAndroid (Google) Code Review2009-12-021-2/+6
| |\ | | | | | | | | | | | | * changes: Update to reflect new priorities for A2DP profile. DO NOT MERGE.
| | * Update to reflect new priorities for A2DP profile. DO NOT MERGE.Jaikumar Ganesh2009-12-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. PRIORITY_OFF is when it is unchecked. 2. PRIORITY_ON is when it is checked. 3. PRIORITY_AUTO_CONNECT is when we want to auto connect. When the box is checked, we want to auto connect, so set the priority to AUTO_CONNECT. When the user disconnects, we set the priority back to PRIORITY_ON. Change priority for Headset profile on the same lines as A2DP profile. AUTO_CONNECT => we auto_connect. ON => Settings app box is checked and we allow incoming connections. OFF => Settings app check box is unchecked. Dr no: Eastham Bug: 2133530
* | | am e2caf2ee: Merge change I82be95f6 into eclairAmith Yamasani2009-12-024-9/+77
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2 * commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8': Feature #2296147 Settings for Car/Desk Dock on certain devices
| * | Merge change I82be95f6 into eclairAndroid (Google) Code Review2009-12-024-9/+77
| |\ \ | | | | | | | | | | | | | | | | * changes: Feature #2296147 Settings for Car/Desk Dock on certain devices