OSDN Git Service
Jean-Baptiste Queru [Mon, 14 Jun 2010 19:13:56 +0000 (12:13 -0700)]
Merge "Replaced deprecated String Constructor"
Jean-Baptiste Queru [Mon, 14 Jun 2010 17:25:34 +0000 (10:25 -0700)]
Merge "replaced deprecated getIntent with parseURI"
Anders Hammar1 [Thu, 8 Apr 2010 08:03:50 +0000 (10:03 +0200)]
Settings: Add a hook for operator or vendor specific settings.
The Settings application now provides a hook that can be used by an
operator or a vendor specific application to add an activity of choice
in the settings menu.
Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
Christian Mehlmauer [Tue, 25 May 2010 17:25:05 +0000 (19:25 +0200)]
Replaced deprecated String Constructor
Change-Id: I452400c9cb00b60316b0270b2f4a68c15d80b698
Christian Mehlmauer [Tue, 25 May 2010 16:39:46 +0000 (18:39 +0200)]
replaced deprecated getIntent with parseURI
Change-Id: Iabf82ff0f9be2a76dece9aafe8603bf83ac7d049
Romain Guy [Wed, 19 May 2010 07:00:14 +0000 (00:00 -0700)]
Merge "Removed Calls to deprecated APIs and unused imports"
Henrik Tuszynski [Wed, 12 May 2010 06:44:09 +0000 (08:44 +0200)]
A button in the master clear information screen was partly hidden.
The master reset button was partially hidden in landscape mode.
This change nests the current layout in a ScrollView making the
layout scrollable.
Change-Id: I2f7b8a222e3a25930b134314640b1c765b964254
Christian Mehlmauer [Mon, 17 May 2010 19:25:15 +0000 (21:25 +0200)]
Removed Calls to deprecated APIs and unused imports
Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
Henrik Hall [Wed, 24 Feb 2010 07:05:05 +0000 (08:05 +0100)]
Fixing Swedish translations of a few texts under "Phone info".
* Build number
* Firmware version
Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
Romain Guy [Tue, 11 May 2010 17:51:12 +0000 (10:51 -0700)]
Merge "The password in the APN settings is shown instead of stars"
Mike Lockwood [Tue, 20 Apr 2010 15:53:49 +0000 (11:53 -0400)]
Display current IP address in advanced Wifi settings screen
Change-Id: I47c6eece376e712b73add72057462926f7b2349f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jiehua Dai [Thu, 4 Mar 2010 12:37:58 +0000 (13:37 +0100)]
The password in the APN settings is shown instead of stars
The password is presented as stars in the edit box, also if one
exits and then enters the APN editor the password is stars.
With this patch the APN password is consistently starified.
The Android Open Source Project [Fri, 5 Feb 2010 16:48:16 +0000 (08:48 -0800)]
am
615f8446: reconcile main tree with open-source eclair
Merge commit '
615f84460214276708732c8f43ba4e04df30a14d' into eclair-plus-aosp
* commit '
615f84460214276708732c8f43ba4e04df30a14d':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:40 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:09:27 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Irfan Sheriff [Thu, 21 Jan 2010 18:44:31 +0000 (10:44 -0800)]
am
ad76f17a: Remove regulatory group setting in advanced wifi setting
Merge commit '
ad76f17a1c75447047fc2791b65e93341925998b' into eclair-plus-aosp
* commit '
ad76f17a1c75447047fc2791b65e93341925998b':
Remove regulatory group setting in advanced wifi setting
Irfan Sheriff [Thu, 21 Jan 2010 18:01:15 +0000 (10:01 -0800)]
Remove regulatory group setting in advanced wifi setting
Bug:
2378844
Change-Id: I2eefa73cca238ab04842ffc8f8968dac5f953456
Michael Chan [Thu, 21 Jan 2010 00:10:29 +0000 (16:10 -0800)]
am
324ab848: Merge "b/
2370089 Pop the dock dialog above the keyguard" into eclair
Merge commit '
324ab8489cdc8ad4bff4e366940fa16e455f5933' into eclair-plus-aosp
* commit '
324ab8489cdc8ad4bff4e366940fa16e455f5933':
b/
2370089 Pop the dock dialog above the keyguard
Michael Chan [Thu, 21 Jan 2010 00:06:44 +0000 (16:06 -0800)]
Merge "b/
2370089 Pop the dock dialog above the keyguard" into eclair
Eric Fischer [Wed, 20 Jan 2010 23:59:27 +0000 (15:59 -0800)]
am
359b2bcc: Check in translations for new Settings strings. DO NOT MERGE
Merge commit '
359b2bccd9b96348d4bad949b000c8310ffe9386' into eclair-plus-aosp
* commit '
359b2bccd9b96348d4bad949b000c8310ffe9386':
Check in translations for new Settings strings. DO NOT MERGE
Michael Chan [Wed, 20 Jan 2010 23:39:13 +0000 (15:39 -0800)]
b/
2370089 Pop the dock dialog above the keyguard
Change-Id: I958ac22defb057fd1ce98a711e3e92073588b1e8
Eric Fischer [Wed, 20 Jan 2010 23:38:48 +0000 (15:38 -0800)]
Check in translations for new Settings strings. DO NOT MERGE
Michael Chan [Wed, 20 Jan 2010 19:54:51 +0000 (11:54 -0800)]
am
04bdae75: Merge "b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Merge commit '
04bdae750fe47d3a008af92c5bfb5eba1e0e6807' into eclair-plus-aosp
* commit '
04bdae750fe47d3a008af92c5bfb5eba1e0e6807':
b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Michael Chan [Wed, 20 Jan 2010 19:51:02 +0000 (11:51 -0800)]
Merge "b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Amith Yamasani [Wed, 20 Jan 2010 15:45:26 +0000 (07:45 -0800)]
am
63c6a309: Merge "Add dock icon for top-level settings. #
2367275" into eclair
Merge commit '
63c6a30908a14cdc8cccee3f6a3e88275dcec30e' into eclair-plus-aosp
* commit '
63c6a30908a14cdc8cccee3f6a3e88275dcec30e':
Add dock icon for top-level settings. #
2367275
Michael Chan [Wed, 20 Jan 2010 15:45:23 +0000 (07:45 -0800)]
am
3fe86a34: 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
Merge commit '
3fe86a346cdcd41fd9498591571d8b512a130240' into eclair-plus-aosp
* commit '
3fe86a346cdcd41fd9498591571d8b512a130240':
b/
2332395 Disable BT when undocked if BT was off to at docking time
Amith Yamasani [Wed, 20 Jan 2010 15:37:33 +0000 (07:37 -0800)]
Merge "Add dock icon for top-level settings. #
2367275" into eclair
Amith Yamasani [Wed, 20 Jan 2010 14:25:32 +0000 (06:25 -0800)]
Add dock icon for top-level settings. #
2367275
Added mdpi and hdpi icons, and updated settings.xml to point to them.
Michael Chan [Wed, 20 Jan 2010 06:35:28 +0000 (22:35 -0800)]
b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Change-Id: Ifa721afa9c4a9d83a4dd70ed75f5d66ec06a01f6
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 [Tue, 19 Jan 2010 07:43:05 +0000 (23:43 -0800)]
am
6ff80dcf: Fix #
2377870 : NPE in Dock settings
Merge commit '
6ff80dcf7a9e97545be90a4c8e9a85e8a311de96' into eclair-plus-aosp
* commit '
6ff80dcf7a9e97545be90a4c8e9a85e8a311de96':
Fix #
2377870 : NPE in Dock settings
Amith Yamasani [Tue, 19 Jan 2010 07:42:44 +0000 (23:42 -0800)]
am
0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #
2367275
Merge commit '
0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a' into eclair-plus-aosp
* commit '
0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a':
New top-level Dock in Settings and a Dock Settings screen with Audio item. #
2367275
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 01:04:45 +0000 (17:04 -0800)]
am
01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Merge commit '
01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp
* commit '
01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
Strings for new Dock settings screen, to get started on the L10N.
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:20:31 +0000 (15:20 -0800)]
am
c9b9f650: Merge "b/
2367861 Auto connect if the user turns on BT while docked." into eclair
Merge commit '
c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5' into eclair-plus-aosp
* commit '
c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5':
b/
2367861 Auto connect if the user turns on BT while docked.
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:12:28 +0000 (16:12 -0800)]
am
d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE" into eclair
Merge commit '
d8d2127936faac93806e5a64447cee0fd8dd2d62' into eclair-plus-aosp
* commit '
d8d2127936faac93806e5a64447cee0fd8dd2d62':
Don't allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE
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
The Android Open Source Project [Tue, 12 Jan 2010 23:19:17 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
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 21:42:04 +0000 (13:42 -0800)]
am
c5aa68f3: b/
2367020 Enable bt profiles by default for car dock.
Merge commit '
c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp
* commit '
c5aa68f3f2201227e85e52ee33937e70e7741c3c':
b/
2367020 Enable bt profiles by default for car dock.
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:16:30 +0000 (15:16 -0800)]
am
d9d8ef26: 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
Merge commit '
d9d8ef264d3a66e7be84908cf0f9d78713c42722' into eclair-plus-aosp
* commit '
d9d8ef264d3a66e7be84908cf0f9d78713c42722':
b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
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:47:57 +0000 (15:47 -0800)]
am
04e32ff3: Merge "b/
2335545 Revert the dock strings back to "For Music and Media"" into eclair
Merge commit '
04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '
04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/
2335545 Revert the dock strings back to "For Music and Media"
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 [Wed, 6 Jan 2010 21:46:13 +0000 (13:46 -0800)]
am
a718832e: Still use ro.monkey
Merge commit '
a718832e28095219a897c6e95e903c1a3fe57c12' into eclair-plus-aosp
* commit '
a718832e28095219a897c6e95e903c1a3fe57c12':
Still use ro.monkey
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:58:54 +0000 (12:58 -0800)]
am
50cb76f5: Rename ro.monkey to monkey.running
Merge commit '
50cb76f58554dbccc51a754a73abef2debd8b721' into eclair-plus-aosp
* commit '
50cb76f58554dbccc51a754a73abef2debd8b721':
Rename ro.monkey to monkey.running
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 [Mon, 21 Dec 2009 22:36:14 +0000 (14:36 -0800)]
am
d8eec52a: b/
2318290 connect should be called instead of connect(profile) if device is unpaired.
Merge commit '
d8eec52a3786a51b38ed280afd84005e6da05ce6' into eclair-plus-aosp
* commit '
d8eec52a3786a51b38ed280afd84005e6da05ce6':
b/
2318290 connect should be called instead of connect(profile) if device is unpaired.
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:28:48 +0000 (13:28 -0800)]
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:07:58 +0000 (13:07 -0800)]
am
c611e5a7: b/
2334482 Dock string changed to Music, ringer, alarms (silences phone)
Merge commit '
c611e5a7c6773f3410f7ba60dc34071f7301ed38' into eclair-plus-aosp
* commit '
c611e5a7c6773f3410f7ba60dc34071f7301ed38':
b/
2334482 Dock string changed to Music, ringer, alarms (silences phone)
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 19:13:08 +0000 (11:13 -0800)]
am
29d70e44: b/
2334482 Disable Music and audio by default for the docks
Merge commit '
29d70e44e42946f7b78f950bad0c4b22c7d5cb5f' into eclair-plus-aosp
* commit '
29d70e44e42946f7b78f950bad0c4b22c7d5cb5f':
b/
2334482 Disable Music and audio by default for the docks
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 19:49:10 +0000 (11:49 -0800)]
am
052ad242: b/
2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '
052ad24219bbb170d9d028a460741524a768915a' into eclair-plus-aosp
* commit '
052ad24219bbb170d9d028a460741524a768915a':
b/
2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
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 07:07:46 +0000 (23:07 -0800)]
am
9463c2f8: b/
2320107 NPE when receiving a Undock event without a device
Merge commit '
9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-plus-aosp
* commit '
9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
b/
2320107 NPE when receiving a Undock event without a device
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:55:15 +0000 (16:55 -0800)]
am
a87f2fd7: b/
2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit '
a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-plus-aosp
* commit '
a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
b/
2320107 Fixed NPE for class bits. Docks do not have class bits.
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
Jaikumar Ganesh [Thu, 10 Dec 2009 10:46:39 +0000 (02:46 -0800)]
am
613549a6: Merge change I2c3621d1 into eclair
Merge commit '
613549a622eac8278c9f81a1df83484c256652bf' into eclair-plus-aosp
* commit '
613549a622eac8278c9f81a1df83484c256652bf':
Fix desk dock getting stuck after unpairing.
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.
Michael Chan [Thu, 10 Dec 2009 10:44:11 +0000 (02:44 -0800)]
am
d1469da1: Merge change I10036c49 into eclair
Merge commit '
d1469da150f44415135d657d57592f066670b317' into eclair-plus-aosp
* commit '
d1469da150f44415135d657d57592f066670b317':
b/
2296110 Disable debugging/logging code before shipping.
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:25:14 +0000 (19:25 -0800)]
am
6e3ee10a: Fix auto connection of A2DP profile.
Merge commit '
6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-plus-aosp
* commit '
6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
Fix auto connection of A2DP profile.
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
Eric Fischer [Thu, 10 Dec 2009 02:10:21 +0000 (18:10 -0800)]
am
e273289c: Merge change Ic0ce5c9a into eclair
Merge commit '
e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-plus-aosp
* commit '
e273289cfb74e08ef0ab35afe2ca34a167a533d8':
Import revised translations. DO NOT MERGE
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
Michael Chan [Thu, 10 Dec 2009 01:47:24 +0000 (17:47 -0800)]
am
d70e205b: Merge change I724fc8fd into eclair
Merge commit '
d70e205b4c6dbf9661b972aa208d5a42927bdd88' into eclair-plus-aosp
* commit '
d70e205b4c6dbf9661b972aa208d5a42927bdd88':
b/
2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
Michael Chan [Thu, 10 Dec 2009 01:47:21 +0000 (17:47 -0800)]
am
1d5f14bd: Merge change I92124d28 into eclair
Merge commit '
1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-plus-aosp
* commit '
1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
b/
2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Michael Chan [Thu, 10 Dec 2009 01:47:17 +0000 (17:47 -0800)]
am
488a80a7: Merge change Id587a517 into eclair
Merge commit '
488a80a7b111f5906bf51101785a95a6c640d265' into eclair-plus-aosp
* commit '
488a80a7b111f5906bf51101785a95a6c640d265':
b/
2314560 Prevent PIN dialog from showing up on undocked docks
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 23:25:34 +0000 (15:25 -0800)]
am
a9f9031b: Display icons in the correct density in the ActivityPicker. This also fixes a memory leak in Home.
Merge commit '
a9f9031ba35433a7e009da6099b17cf603372a70' into eclair-plus-aosp
* commit '
a9f9031ba35433a7e009da6099b17cf603372a70':
Display icons in the correct density in the ActivityPicker.
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 22:22:17 +0000 (14:22 -0800)]
am
14638566: b/
2296110 Car Dock - Enable BT if not already enabled.
Merge commit '
146385663bb55d9f55ad179d3c35ccf5cac13fc8' into eclair-plus-aosp
* commit '
146385663bb55d9f55ad179d3c35ccf5cac13fc8':
b/
2296110 Car Dock - Enable BT if not already enabled.
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
Michael Chan [Tue, 8 Dec 2009 04:50:54 +0000 (20:50 -0800)]
am
0c75b2d2: Merge change I80790bdb into eclair
Merge commit '
0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp
* commit '
0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
b/
2296110 Dialog for setting up dock audio.
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:52:22 +0000 (15:52 -0800)]
am
55dc6cb9: Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '
55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-plus-aosp
* commit '
55dc6cb99db1f9f6677dfec5a25a34e933807be5':
Disconnect even Sinks in Connecting state while connecting another sink.
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 [Fri, 4 Dec 2009 04:44:50 +0000 (20:44 -0800)]
am
0bd445b9: b/
2296110 New Dialog which appears when phone is place on dock.
Merge commit '
0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-plus-aosp
* commit '
0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/
2296110 New Dialog which appears when phone is place on dock.
OSDN Git Service
