Michael Chan
04bdae750f
Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
2010-01-20 11:51:02 -08:00
Amith Yamasani
63c6a30908
Merge "Add dock icon for top-level settings. #2367275 " into eclair
2010-01-20 07:37:33 -08:00
Amith Yamasani
f7c5a11a03
Add dock icon for top-level settings. #2367275
...
Added mdpi and hdpi icons, and updated settings.xml to point to them.
2010-01-20 06:25:32 -08:00
Michael Chan
c93b82496e
b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
...
Change-Id: Ifa721afa9c4a9d83a4dd70ed75f5d66ec06a01f6
2010-01-19 22:35:28 -08:00
Michael Chan
3fe86a346c
b/2332395 Disable BT when undocked if BT was off 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
Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
2010-01-19 16:15:44 -08:00
Amith Yamasani
6ff80dcf7a
Fix #2377870 : NPE in Dock settings
...
If the Dock settings is launched after reboot but before it is docked,
the settings screen crashes because the dock status is not available.
This fixes the case where there was never a pending intent for dock status.
2010-01-15 19:10:55 -08:00
Amith Yamasani
0e2ab4f884
New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
...
Add a new top-level setting for car/desktop dock settings.
Sub menu contains one item - Audio (settings)
Sub text for Audio shows current docked status and launches either the
audio settings or a dialog saying that you're not docked and you need to
buy a new dock from Google (kidding).
2010-01-15 11:53:42 -08:00
Amith Yamasani
01a868d73b
Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
2010-01-14 16:33:15 -08:00
Amith Yamasani
237749dd85
Strings for new Dock settings screen, to get started on the L10N.
2010-01-14 16:27:37 -08:00
Michael Chan
c9b9f650fc
Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair
2010-01-14 15:17:30 -08:00
Michael Chan
845e740fc6
b/2367861 Auto connect if the user turns on BT while docked.
...
Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
2010-01-14 11:26:18 -08:00
Amith Yamasani
d8d2127936
Merge "Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair
2010-01-12 16:10:17 -08:00
Amith Yamasani
20043f40fc
Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
...
Backport from froyo.
If the monkey is running, exit the SIM lock settings activity.
2010-01-12 14:55:16 -08:00
Michael Chan
c5aa68f3f2
b/2367020 Enable bt profiles by default for car dock.
...
Change-Id: I95b1330ab432d38fb509321d843d04a41185d331
2010-01-12 12:54:51 -08:00
Michael Chan
d9d8ef264d
Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair
2010-01-11 15:14:36 -08:00
Michael Chan
fb5b54d77a
b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
...
Change-Id: I02825cbde24ff0215787bb2d4f78cd6e7e1f4033
2010-01-08 18:33:43 -08:00
Michael Chan
04e32ff35f
Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair
2010-01-06 15:44:30 -08:00
Michael Chan
55a05f8592
b/2335545 Revert the dock strings back to "For Music and Media"
...
Change-Id: I1c8cbfb07cfb9822d62a5fa688cee060f81ab221
2010-01-06 15:10:56 -08:00
Ying Wang
a718832e28
Still use ro.monkey
...
http://b/issue?id=1681101
So just some refactoring.
2010-01-06 09:46:17 -08:00
Ying Wang
50cb76f585
Rename ro.monkey to monkey.running
...
So that Monkey can set it before running and reset it after running.
2010-01-04 12:04:25 -08:00
Michael Chan
d8eec52a37
b/2318290 connect should be called instead of connect(profile) if device is unpaired.
...
Change-Id: I5d665d1c3149ffc77387f96c3822e80b84c78de1
2009-12-17 14:30:05 -08:00
Michael Chan
c0a606d2d6
b/2334482 Revert white spaces
...
Change-Id: I52981da0928a9852f3256a7cee1f03768d7735a4
2009-12-17 13:21:29 -08:00
Michael Chan
c611e5a7c6
b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
...
Change-Id: I36ee0f20b35df1d8f91f543dd315fc8cef184143
2009-12-17 13:04:24 -08:00
Michael Chan
29d70e44e4
b/2334482 Disable Music and audio by default for the docks
...
Change-Id: I1d84cd1dfe54dd3ae4e9183a291cb8f3e0d5da5a
2009-12-17 10:49:14 -08:00
Michael Chan
052ad24219
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
...
Change-Id: Iae98c45e4c1c5d36f33d6519ee2adba515f6b9aa
2009-12-14 10:42:27 -08:00
Michael Chan
9463c2f8d5
b/2320107 NPE when receiving a Undock event without a device
...
Change-Id: Ic3c964f2d58462a1b7c82f2de2dd997679f90ba7
2009-12-10 22:53:14 -08:00
Michael Chan
a87f2fd7d8
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
...
Change-Id: Ibe4f697a906010f8f3ee270b891db286a4976f8a
2009-12-10 16:07:11 -08:00
Android (Google) Code Review
613549a622
Merge change I2c3621d1 into eclair
...
* changes:
Fix desk dock getting stuck after unpairing.
2009-12-10 02:44:12 -08:00
Android (Google) Code Review
d1469da150
Merge change I10036c49 into eclair
...
* changes:
b/2296110 Disable debugging/logging code before shipping.
2009-12-10 02:41:41 -08:00
Jaikumar Ganesh
b172cd5d23
Fix desk dock getting stuck after unpairing.
...
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
2009-12-10 02:02:47 -08:00
Jaikumar Ganesh
6e3ee10a99
Fix auto connection of A2DP profile.
...
When the user selects profiles from the UI, set priority to ON.
Dr No: Eastham
Bug: 2317323
2009-12-09 19:15:30 -08:00
Android (Google) Code Review
e273289cfb
Merge change Ic0ce5c9a into eclair
...
* changes:
Import revised translations. DO NOT MERGE
2009-12-09 18:04:10 -08:00
Michael Chan
6fd5bc935e
b/2296110 Disable debugging/logging code before shipping.
...
Change-Id: I10036c49e3c3d61d0fa1af74f1f0cd9d03502103
2009-12-09 18:00:48 -08:00
Android (Google) Code Review
d70e205b4c
Merge change I724fc8fd into eclair
...
* changes:
b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
2009-12-09 17:45:07 -08:00
Android (Google) Code Review
1d5f14bd54
Merge change I92124d28 into eclair
...
* changes:
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
2009-12-09 17:45:03 -08:00
Android (Google) Code Review
488a80a7b1
Merge change Id587a517 into eclair
...
* changes:
b/2314560 Prevent PIN dialog from showing up on undocked docks
2009-12-09 17:44:53 -08:00
Michael Chan
792edfcf12
b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
...
Change-Id: I724fc8fd07d33cfa6e68221a766754dcb1f6aeba
2009-12-09 17:34:54 -08:00
Eric Fischer
c0ce5c9ae3
Import revised translations. DO NOT MERGE
2009-12-09 17:28:18 -08:00
Michael Chan
503c236db5
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
...
Change-Id: I92124d2856e6c825a2b4148473431789a1f5b156
2009-12-09 17:27:56 -08:00
Michael Chan
d617a0781c
b/2314560 Prevent PIN dialog from showing up on undocked docks
...
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
2009-12-09 17:16:46 -08:00
Romain Guy
a9f9031ba3
Display icons in the correct density in the ActivityPicker.
...
This also fixes a memory leak in Home.
Do not merge.
Change-Id: Ib69b4055fae2c8705887bbd12be7fa61b689eb03
2009-12-09 15:20:46 -08:00
Michael Chan
146385663b
b/2296110 Car Dock - Enable BT if not already enabled.
...
Change-Id: If1798f62c9438e58c342869176437067f941c8cb
2009-12-08 14:18:13 -08:00
Android (Google) Code Review
0c75b2d2dc
Merge change I80790bdb into eclair
...
* changes:
b/2296110 Dialog for setting up dock audio.
2009-12-07 20:48:16 -08:00
Michael Chan
df9504ef58
b/2296110 Dialog for setting up dock audio.
...
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
2009-12-07 16:57:26 -08:00
Jaikumar Ganesh
55dc6cb99d
Disconnect even Sinks in Connecting state while connecting another sink.
...
We can hit this more when using a Car Dock
Bug: 2133530
Dr No: Eastham
2009-12-07 15:22:50 -08:00
Michael Chan
0bd445b974
b/2296110 New Dialog which appears when phone is place on dock.
...
Change-Id: I58b216ee9b4ca9ce16210309358c0512271e128e
2009-12-03 20:32:38 -08:00
Michael Chan
3327f78873
b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
...
Change-Id: I1b4963a167b633c0905e2719ab3f651ff8be9f2c
2009-12-03 11:45:59 -08:00
Android (Google) Code Review
9f1d9c1688
Merge change I9a1ed7e4 into eclair
...
* changes:
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
2009-12-02 16:02:52 -08:00
Android (Google) Code Review
e2caf2eefe
Merge change I82be95f6 into eclair
...
* changes:
Feature #2296147 Settings for Car/Desk Dock on certain devices
2009-12-02 15:42:48 -08:00
Jaikumar Ganesh
9a1ed7e4e6
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
...
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
2009-12-02 15:38:52 -08:00