OSDN Git Service
Michael Chan [Fri, 15 Jan 2010 01:52:40 +0000 (17:52 -0800)]
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
Amith Yamasani [Sat, 16 Jan 2010 03:10:55 +0000 (19:10 -0800)]
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.
Amith Yamasani [Fri, 15 Jan 2010 00:12:21 +0000 (16:12 -0800)]
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).
Amith Yamasani [Fri, 15 Jan 2010 00:33:15 +0000 (16:33 -0800)]
Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Amith Yamasani [Fri, 15 Jan 2010 00:21:51 +0000 (16:21 -0800)]
Strings for new Dock settings screen, to get started on the L10N.
Michael Chan [Thu, 14 Jan 2010 23:17:30 +0000 (15:17 -0800)]
Merge "b/
2367861 Auto connect if the user turns on BT while docked." into eclair
Michael Chan [Thu, 14 Jan 2010 00:31:39 +0000 (16:31 -0800)]
b/
2367861 Auto connect if the user turns on BT while docked.
Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
Amith Yamasani [Wed, 13 Jan 2010 00:10:17 +0000 (16:10 -0800)]
Merge "Don't allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE" into eclair
Amith Yamasani [Fri, 8 Jan 2010 03:05:07 +0000 (19:05 -0800)]
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.
Michael Chan [Tue, 12 Jan 2010 19:39:15 +0000 (11:39 -0800)]
b/
2367020 Enable bt profiles by default for car dock.
Change-Id: I95b1330ab432d38fb509321d843d04a41185d331
Michael Chan [Mon, 11 Jan 2010 23:14:36 +0000 (15:14 -0800)]
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
Michael Chan [Mon, 4 Jan 2010 20:15:11 +0000 (12:15 -0800)]
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
Michael Chan [Wed, 6 Jan 2010 23:44:30 +0000 (15:44 -0800)]
Merge "b/
2335545 Revert the dock strings back to "For Music and Media"" into eclair
Michael Chan [Wed, 6 Jan 2010 23:10:56 +0000 (15:10 -0800)]
b/
2335545 Revert the dock strings back to "For Music and Media"
Change-Id: I1c8cbfb07cfb9822d62a5fa688cee060f81ab221
Ying Wang [Tue, 5 Jan 2010 02:45:10 +0000 (18:45 -0800)]
Still use ro.monkey
http://b/issue?id=
1681101
So just some refactoring.
Ying Wang [Mon, 4 Jan 2010 20:04:25 +0000 (12:04 -0800)]
Rename ro.monkey to monkey.running
So that Monkey can set it before running and reset it after running.
Michael Chan [Thu, 10 Dec 2009 22:53:35 +0000 (14:53 -0800)]
b/
2318290 connect should be called instead of connect(profile) if device is unpaired.
Change-Id: I5d665d1c3149ffc77387f96c3822e80b84c78de1
Michael Chan [Thu, 17 Dec 2009 21:21:29 +0000 (13:21 -0800)]
b/
2334482 Revert white spaces
Change-Id: I52981da0928a9852f3256a7cee1f03768d7735a4
Michael Chan [Thu, 17 Dec 2009 21:04:24 +0000 (13:04 -0800)]
b/
2334482 Dock string changed to Music, ringer, alarms (silences phone)
Change-Id: I36ee0f20b35df1d8f91f543dd315fc8cef184143
Michael Chan [Thu, 17 Dec 2009 18:49:14 +0000 (10:49 -0800)]
b/
2334482 Disable Music and audio by default for the docks
Change-Id: I1d84cd1dfe54dd3ae4e9183a291cb8f3e0d5da5a
Michael Chan [Mon, 14 Dec 2009 18:42:27 +0000 (10:42 -0800)]
b/
2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Change-Id: Iae98c45e4c1c5d36f33d6519ee2adba515f6b9aa
Michael Chan [Fri, 11 Dec 2009 06:53:14 +0000 (22:53 -0800)]
b/
2320107 NPE when receiving a Undock event without a device
Change-Id: Ic3c964f2d58462a1b7c82f2de2dd997679f90ba7
Michael Chan [Fri, 11 Dec 2009 00:05:59 +0000 (16:05 -0800)]
b/
2320107 Fixed NPE for class bits. Docks do not have class bits.
Change-Id: Ibe4f697a906010f8f3ee270b891db286a4976f8a
Android (Google) Code Review [Thu, 10 Dec 2009 10:44:12 +0000 (02:44 -0800)]
Merge change I2c3621d1 into eclair
* changes:
Fix desk dock getting stuck after unpairing.
Android (Google) Code Review [Thu, 10 Dec 2009 10:41:41 +0000 (02:41 -0800)]
Merge change I10036c49 into eclair
* changes:
b/
2296110 Disable debugging/logging code before shipping.
Jaikumar Ganesh [Thu, 10 Dec 2009 09:59:19 +0000 (01:59 -0800)]
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
Jaikumar Ganesh [Thu, 10 Dec 2009 03:15:30 +0000 (19:15 -0800)]
Fix auto connection of A2DP profile.
When the user selects profiles from the UI, set priority to ON.
Dr No: Eastham
Bug:
2317323
Android (Google) Code Review [Thu, 10 Dec 2009 02:04:10 +0000 (18:04 -0800)]
Merge change Ic0ce5c9a into eclair
* changes:
Import revised translations. DO NOT MERGE
Michael Chan [Thu, 10 Dec 2009 02:00:48 +0000 (18:00 -0800)]
b/
2296110 Disable debugging/logging code before shipping.
Change-Id: I10036c49e3c3d61d0fa1af74f1f0cd9d03502103
Android (Google) Code Review [Thu, 10 Dec 2009 01:45:07 +0000 (17:45 -0800)]
Merge change I724fc8fd into eclair
* changes:
b/
2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
Android (Google) Code Review [Thu, 10 Dec 2009 01:45:03 +0000 (17:45 -0800)]
Merge change I92124d28 into eclair
* changes:
b/
2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Android (Google) Code Review [Thu, 10 Dec 2009 01:44:53 +0000 (17:44 -0800)]
Merge change Id587a517 into eclair
* changes:
b/
2314560 Prevent PIN dialog from showing up on undocked docks
Michael Chan [Thu, 10 Dec 2009 01:32:58 +0000 (17:32 -0800)]
b/
2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
Change-Id: I724fc8fd07d33cfa6e68221a766754dcb1f6aeba
Eric Fischer [Thu, 10 Dec 2009 01:28:18 +0000 (17:28 -0800)]
Import revised translations. DO NOT MERGE
Michael Chan [Wed, 9 Dec 2009 06:18:23 +0000 (22:18 -0800)]
b/
2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Change-Id: I92124d2856e6c825a2b4148473431789a1f5b156
Michael Chan [Thu, 10 Dec 2009 01:13:30 +0000 (17:13 -0800)]
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
Romain Guy [Wed, 9 Dec 2009 20:17:33 +0000 (12:17 -0800)]
Display icons in the correct density in the ActivityPicker.
This also fixes a memory leak in Home.
Do not merge.
Change-Id: Ib69b4055fae2c8705887bbd12be7fa61b689eb03
Michael Chan [Tue, 8 Dec 2009 04:48:39 +0000 (20:48 -0800)]
b/
2296110 Car Dock - Enable BT if not already enabled.
Change-Id: If1798f62c9438e58c342869176437067f941c8cb
Android (Google) Code Review [Tue, 8 Dec 2009 04:48:16 +0000 (20:48 -0800)]
Merge change I80790bdb into eclair
* changes:
b/
2296110 Dialog for setting up dock audio.
Michael Chan [Sun, 6 Dec 2009 09:04:04 +0000 (01:04 -0800)]
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
Jaikumar Ganesh [Mon, 7 Dec 2009 23:22:50 +0000 (15:22 -0800)]
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
Michael Chan [Thu, 3 Dec 2009 08:31:59 +0000 (00:31 -0800)]
b/
2296110 New Dialog which appears when phone is place on dock.
Change-Id: I58b216ee9b4ca9ce16210309358c0512271e128e
Michael Chan [Thu, 3 Dec 2009 08:25:29 +0000 (00:25 -0800)]
b/
2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Change-Id: I1b4963a167b633c0905e2719ab3f651ff8be9f2c
Android (Google) Code Review [Thu, 3 Dec 2009 00:02:52 +0000 (16:02 -0800)]
Merge change I9a1ed7e4 into eclair
* changes:
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Android (Google) Code Review [Wed, 2 Dec 2009 23:42:48 +0000 (15:42 -0800)]
Merge change I82be95f6 into eclair
* changes:
Feature #
2296147 Settings for Car/Desk Dock on certain devices
Jaikumar Ganesh [Tue, 24 Nov 2009 22:43:45 +0000 (14:43 -0800)]
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
Amith Yamasani [Wed, 2 Dec 2009 21:56:05 +0000 (13:56 -0800)]
Feature #
2296147 Settings for Car/Desk Dock on certain devices
This inserts a launcher for the Dock settings dialog, if the
device supports it and is currently docked.
The menu item disappears if the phone is not docked in the car/desk dock.
Eric Fischer [Wed, 2 Dec 2009 22:57:56 +0000 (14:57 -0800)]
Import revised translations. DO NOT MERGE
Amith Yamasani [Wed, 2 Dec 2009 03:06:14 +0000 (19:06 -0800)]
Setting in Sound & Display for trackball pulsing on notification. Bug #
2238250
Eric Fischer [Mon, 30 Nov 2009 19:38:40 +0000 (11:38 -0800)]
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Nov 2009 00:45:29 +0000 (16:45 -0800)]
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:24:10 +0000 (17:24 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Fri, 13 Nov 2009 03:50:45 +0000 (19:50 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Thu, 12 Nov 2009 03:15:47 +0000 (19:15 -0800)]
Merge change I2d844842 into eclair
* changes:
Fix for NPE in #
2248683
Amith Yamasani [Wed, 11 Nov 2009 23:22:37 +0000 (15:22 -0800)]
Fix for NPE in #
2248683
Also fix a problem in type-to-filter. It was looking for substring match
instead of searching on word boundaries. It will now search by word
boundaries (separated by space).
Jason Chen [Wed, 11 Nov 2009 16:39:31 +0000 (08:39 -0800)]
Fix misspellings in the Settings app.
Bug:
2176816
Michael Chan [Mon, 9 Nov 2009 06:53:32 +0000 (22:53 -0800)]
b/
2226832 Showing Pairing Dialog in the foreground
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery. Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
Android (Google) Code Review [Fri, 6 Nov 2009 21:44:30 +0000 (16:44 -0500)]
Merge change Ib720a080 into eclair
* changes:
Updated icons for Settings. DO NOT MERGE
Michael Chan [Fri, 6 Nov 2009 02:25:55 +0000 (18:25 -0800)]
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Also added test app.
Daniel Sandler [Tue, 3 Nov 2009 19:09:48 +0000 (14:09 -0500)]
Updated icons for Settings. DO NOT MERGE
Fixes http://b/
2105756
DrNo for eclair: mcleron
Change-Id: Ib720a080613a4513bd7bd62ae416c243ef9841a7
Michael Chan [Thu, 5 Nov 2009 01:19:48 +0000 (17:19 -0800)]
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Jean-Michel Trivi [Fri, 30 Oct 2009 23:03:47 +0000 (16:03 -0700)]
Add backup string for a platform setting to enable or disable
advanced audio recording features on QSD8k phones.
Android (Google) Code Review [Fri, 30 Oct 2009 18:09:06 +0000 (14:09 -0400)]
Merge change I1d016ce3 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 17:05:54 +0000 (10:05 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Fri, 30 Oct 2009 16:56:20 +0000 (12:56 -0400)]
Merge change Ibe1d06fc into eclair
* changes:
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Mike Lockwood [Fri, 30 Oct 2009 07:08:03 +0000 (03:08 -0400)]
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Fixes bug b/
2226257 (Brightness wonky)
Change-Id: Ibe1d06fc907960dcb6a70faa92e6c3a562016865
Signed-off-by: Mike Lockwood <lockwood@android.com>
Michael Chan [Thu, 29 Oct 2009 21:42:06 +0000 (14:42 -0700)]
b/
2219381 Gray out Bluetooth Settings for the emulator
Change-Id: I11ae2e6c7652ba550aeadf0dadb6f520c19dedc6
Android (Google) Code Review [Thu, 29 Oct 2009 13:28:35 +0000 (09:28 -0400)]
Merge change I4d31288f into eclair
* changes:
Fix for
1974140. Delete entry if not valid on hitting home.
Eric Fischer [Thu, 29 Oct 2009 04:19:37 +0000 (21:19 -0700)]
Import revised translations. DO NOT MERGE
Amith Yamasani [Wed, 28 Oct 2009 23:59:17 +0000 (16:59 -0700)]
Fix for
1974140. Delete entry if not valid on hitting home.
If user doesn't enter an APN or name, then delete the entry on hitting home.
And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
Mike Lockwood [Wed, 28 Oct 2009 22:33:04 +0000 (18:33 -0400)]
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Fixes a problem that could result in the backlight getting set to a bogus brightness
level if you open the dialog and cancel when in automatic mode.
Bug b/
2015734
Change-Id: I302697e4ebd37afcdbfdd74ba0b1cc9be27ee40b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Wed, 28 Oct 2009 07:16:41 +0000 (03:16 -0400)]
Merge change I2abbb876 into eclair
* changes:
New widgets
Mike Cleron [Tue, 27 Oct 2009 21:05:27 +0000 (14:05 -0700)]
New widgets
Eric Fischer [Tue, 27 Oct 2009 00:54:44 +0000 (17:54 -0700)]
Use consistent punctuation for the Chinese locale names.
Bug
2216349
Jaikumar Ganesh [Mon, 26 Oct 2009 20:01:36 +0000 (13:01 -0700)]
Add Authentication Type field to the APN settings.
Bug:
1817100
Android (Google) Code Review [Fri, 23 Oct 2009 17:09:14 +0000 (13:09 -0400)]
Merge change I40dd2cfc into eclair
* changes:
Fix for
2202408: Replace Never Timeout with 30 minutes
Amith Yamasani [Fri, 23 Oct 2009 03:57:32 +0000 (20:57 -0700)]
Fix for
2202408: Replace Never Timeout with 30 minutes
Maximum timeout is now 30 minutes. Never Timeout will cause
burn-in problems with OLED and a bit with LCD as well.
Neel Parekh [Fri, 23 Oct 2009 01:30:00 +0000 (18:30 -0700)]
Minor change to use defined key rather than a string.
Neel Parekh [Fri, 23 Oct 2009 00:12:49 +0000 (17:12 -0700)]
Add a intent extra to only show the access points in the settings menu.
Bug:
2198865
Eric Fischer [Wed, 21 Oct 2009 17:47:42 +0000 (10:47 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Mon, 19 Oct 2009 22:22:38 +0000 (18:22 -0400)]
Merge change I61c28c5f into eclair
* changes:
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Amith Yamasani [Mon, 19 Oct 2009 18:45:18 +0000 (11:45 -0700)]
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Mike Lockwood [Thu, 15 Oct 2009 04:19:04 +0000 (21:19 -0700)]
Remove PowerManager.setAutoBrightness()
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dianne Hackborn [Tue, 13 Oct 2009 22:03:57 +0000 (15:03 -0700)]
Fix issue #
2185893: Can not install 3D Media Gallery
Allow the package details to show packages whose .apk is not installed.
Change-Id: I45aec93e6f731beb5fe7010ec680eb8df0241aed
Eric Fischer [Thu, 8 Oct 2009 22:02:30 +0000 (15:02 -0700)]
am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair
* commit '
0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Thu, 8 Oct 2009 15:06:27 +0000 (08:06 -0700)]
Show an error message when the remote side cancels the authentication
and show OPP device list correctly.
Dr No: Eastham
Bug:
2174874
Nick Pelly [Wed, 7 Oct 2009 23:03:34 +0000 (01:03 +0200)]
Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug:
2158765
Joke: When is a car not a car? When it turns into a driveway.
Android (Google) Code Review [Wed, 7 Oct 2009 18:38:10 +0000 (14:38 -0400)]
Merge change Ia3151ad3 into eclair
* changes:
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 7 Oct 2009 00:47:46 +0000 (20:47 -0400)]
Merge change Ifad4a4c0 into eclair
* changes:
Add L2tpIpsec case in VpnSettings.processSecrets()
Eric Fischer [Tue, 6 Oct 2009 23:54:08 +0000 (16:54 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jaikumar Ganesh [Tue, 6 Oct 2009 15:01:21 +0000 (08:01 -0700)]
Remove STOPSHIP debug log.
Bug:
2151872
Dr No: Eastham
Hung-ying Tyan [Tue, 6 Oct 2009 08:15:42 +0000 (16:15 +0800)]
Add L2tpIpsec case in VpnSettings.processSecrets()
Chung-yih Wang [Fri, 2 Oct 2009 08:06:22 +0000 (16:06 +0800)]
Add the auth_alg field back.
This change is to fix the issue http://b/issue?id=
2161539.
The auth_alg field is required for auth. type 'SHARED' with WEP mode, it will
not be automatically selected as claimed. The change has been verified on
Linksys WRT54G.
Eric Fischer [Fri, 2 Oct 2009 00:02:17 +0000 (17:02 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Thu, 1 Oct 2009 20:07:49 +0000 (16:07 -0400)]
Merge change I25f2afba into eclair
* changes:
Check if a device is added to the cache before returning.
Jaikumar Ganesh [Thu, 1 Oct 2009 18:34:17 +0000 (11:34 -0700)]
Check if a device is added to the cache before returning.
For incoming connections, we don't have the device in the Settings cache.
After we tried to readPairedDevices, check if we added to the cache.
If we successfully added it, continue with the connections, else bail out.
Bug id:
2160617
Change-Id: I25f2afba8ef6d2c32a7940f967cf12f1321ad9e0
Android (Google) Code Review [Thu, 1 Oct 2009 18:35:13 +0000 (14:35 -0400)]
Merge change I454a0dbf into eclair
* changes:
SecuritySettings: revert "minor tuning".
Chia-chi Yeh [Thu, 1 Oct 2009 18:32:54 +0000 (02:32 +0800)]
SecuritySettings: revert "minor tuning".
Android (Google) Code Review [Thu, 1 Oct 2009 18:17:26 +0000 (14:17 -0400)]
Merge change If764d20a into eclair
* changes:
SecuritySettings: fix a the status before handling the intent.
Chia-chi Yeh [Thu, 1 Oct 2009 18:16:08 +0000 (02:16 +0800)]
SecuritySettings: fix a the status before handling the intent.