OSDN Git Service
John Wang [Fri, 22 Jan 2010 18:24:47 +0000 (10:24 -0800)]
am
08cb0024: Handle emergency calls only status in ServiceStateTracker.
Merge commit '
08cb0024026e0f42612ab569e1e4067d5ede3bf8' into eclair-plus-aosp
* commit '
08cb0024026e0f42612ab569e1e4067d5ede3bf8':
Handle emergency calls only status in ServiceStateTracker.
John Wang [Fri, 22 Jan 2010 01:44:09 +0000 (17:44 -0800)]
Handle emergency calls only status in ServiceStateTracker.
For bug
2352094, handle emergency calls only status and
pass the emergency calls only string via SPN_STRING_UPDATED intent.
Fred Quintana [Fri, 22 Jan 2010 01:35:28 +0000 (17:35 -0800)]
am
9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug b/issue?id=
2360782" into eclair
Merge commit '
9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp
* commit '
9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
initialize sync adapters that get installed while the system is running
jsh [Fri, 22 Jan 2010 01:35:18 +0000 (17:35 -0800)]
am
036e2108: Fix NPE when importing from USIM.
Merge commit '
036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp
* commit '
036e21083d9936425687d7de29e95b2c458a7e4a':
Fix NPE when importing from USIM.
Fred Quintana [Fri, 22 Jan 2010 01:30:07 +0000 (17:30 -0800)]
Merge "initialize sync adapters that get installed while the system is running bug b/issue?id=
2360782" into eclair
jsh [Fri, 22 Jan 2010 00:58:17 +0000 (16:58 -0800)]
Fix NPE when importing from USIM.
Need to check if fileIds is empty.
b/
2349232
Yu Shan Emily Lau [Thu, 21 Jan 2010 23:14:36 +0000 (15:14 -0800)]
am
b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair
Merge commit '
b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp
* commit '
b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
Eric Fischer [Thu, 21 Jan 2010 23:14:30 +0000 (15:14 -0800)]
am
50adb167: Pull in "emergency calls only" translations.
Merge commit '
50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp
* commit '
50adb167534889421dc0d7cfc7d3bf663c03f01c':
Pull in "emergency calls only" translations.
Yu Shan Emily Lau [Thu, 21 Jan 2010 23:07:51 +0000 (15:07 -0800)]
Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair
John Wang [Thu, 21 Jan 2010 22:06:35 +0000 (14:06 -0800)]
am
7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '
7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp
* commit '
7f70998dec6d7db850373b7e75677ecf72904878':
Add Emergency Calls Only String.
Eric Fischer [Thu, 21 Jan 2010 21:52:09 +0000 (13:52 -0800)]
Pull in "emergency calls only" translations.
John Wang [Thu, 21 Jan 2010 21:38:32 +0000 (13:38 -0800)]
Merge "Add Emergency Calls Only String." into eclair
Fred Quintana [Thu, 21 Jan 2010 21:14:49 +0000 (13:14 -0800)]
initialize sync adapters that get installed while the system is running
bug http://b/issue?id=
2360782
John Wang [Thu, 21 Jan 2010 20:46:01 +0000 (12:46 -0800)]
Add Emergency Calls Only String.
Prepare strings for bug
2352094.
The string is the same as the settings.R.string.radioInfo_service_emergency,
so use the same msgid and translations.
Yu Shan Emily Lau [Thu, 21 Jan 2010 20:38:02 +0000 (12:38 -0800)]
Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
Wei Huang [Thu, 21 Jan 2010 20:28:08 +0000 (12:28 -0800)]
am
495bae67: Merge "fix bug
2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Merge commit '
495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp
* commit '
495bae67ff7df4a11325a4cc1d8af288f82128fe':
fix bug
2264186: clean up the outstanding async queries in ContactHeaderWidget.
Wei Huang [Thu, 21 Jan 2010 20:21:11 +0000 (12:21 -0800)]
Merge "fix bug
2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Wei Huang [Thu, 21 Jan 2010 10:51:34 +0000 (02:51 -0800)]
fix bug
2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.
I tested this by calling
ContactHeaderWidget.bindFromPhoneNumber(number1);
ContactHeaderWidget.bindFromPhoneNumber(number2);
where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.
- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.
Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
The Android Open Source Project [Thu, 21 Jan 2010 19:21:25 +0000 (11:21 -0800)]
merge from open-source master
Ying Wang [Thu, 21 Jan 2010 19:12:29 +0000 (11:12 -0800)]
am
6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair
Merge commit '
6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp
* commit '
6f9e2c648c0588a2eedef2746c9750ed9c6945be':
Find layout classes in all "layout-*" dirs.
Ying Wang [Thu, 21 Jan 2010 19:07:14 +0000 (11:07 -0800)]
Merge "Find layout classes in all "layout-*" dirs." into eclair
Robert Greenwalt [Thu, 21 Jan 2010 18:05:13 +0000 (10:05 -0800)]
am
9fdf82e0: Merge "Try to switch to another default net on connection failure." into eclair
Merge commit '
9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp
* commit '
9fdf82e080ea20086378e751ace245a4a1b022dc':
Try to switch to another default net on connection failure.
Robert Greenwalt [Thu, 21 Jan 2010 17:57:46 +0000 (09:57 -0800)]
Merge "Try to switch to another default net on connection failure." into eclair
Irfan Sheriff [Thu, 21 Jan 2010 15:52:52 +0000 (07:52 -0800)]
am
dcc14d6a: Merge "Use MCC value to always override channel count setting" into eclair
Merge commit '
dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp
* commit '
dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2':
Use MCC value to always override channel count setting
Irfan Sheriff [Thu, 21 Jan 2010 15:46:49 +0000 (07:46 -0800)]
Merge "Use MCC value to always override channel count setting" into eclair
Grace Kloba [Thu, 21 Jan 2010 07:34:42 +0000 (23:34 -0800)]
am
f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit '
f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp
* commit '
f6aed0e0a7c96094b66f5426baad78032b794497':
DO NOT MERGE
Grace Kloba [Thu, 21 Jan 2010 07:30:05 +0000 (23:30 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Thu, 21 Jan 2010 07:26:03 +0000 (23:26 -0800)]
am
d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit '
d5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp
* commit '
d5ada83c719d366d3063572ca6ce5ab8918fd39b':
ScaleGestureDetector needs to query the displaymetrics
Grace Kloba [Thu, 21 Jan 2010 07:06:43 +0000 (23:06 -0800)]
ScaleGestureDetector needs to query the displaymetrics
for the width/height on each touch down as orientation
can change.
This should fix the problem where we can't pinch on the
top right corner when device is in landscape mode.
Ying Wang [Thu, 21 Jan 2010 06:12:46 +0000 (22:12 -0800)]
Find layout classes in all "layout-*" dirs.
Before this CL, the generated keep flags for layout classes are incomplete,
such as layout classes in res/layout-port/ and res/layout-land and so on.
Grace Kloba [Sun, 17 Jan 2010 07:01:38 +0000 (23:01 -0800)]
DO NOT MERGE
Just scale the canvas instead of changing the real
scale factor during pinch.
Added over limit zoom feedback for pinch in the WebView.
Fix http://b/issue?id=
2383539
Nick Pelly [Thu, 21 Jan 2010 04:46:35 +0000 (20:46 -0800)]
am
e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Merge commit '
e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp
* commit '
e834722f547d13eaa453464502456892c6225e42':
Fix failure to open AVRCP input device due to EPERM.
Nick Pelly [Thu, 21 Jan 2010 04:43:54 +0000 (20:43 -0800)]
Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Nick Pelly [Thu, 21 Jan 2010 03:36:49 +0000 (19:36 -0800)]
Fix failure to open AVRCP input device due to EPERM.
Sleep for 100us and try to open the input device again if it fails, with a
maximum of 10 attempts.
We need the retry logic because setting permissions on a new input device is
racy. The init process watches for new input device (via uevent) and sets the
permission on them in devices.c:make_device(). However at the same time
EventHub.cpp watches for new input devices from the system_server process, and
immediately tries to open them. I can't see a simple way to avoid this race
condition.
As best as I can tell this race condition has always exisited.
There must have been some timing change that happened recently that causes us
to hit this race condition much more often. See repro notes in referenced bug.
Bug:
2375632
Robert Greenwalt [Thu, 21 Jan 2010 03:29:41 +0000 (19:29 -0800)]
Try to switch to another default net on connection failure.
This shouldn't be required, but there seems to be something odd going on
in wifi and it doesn't hurt to try other available options. Makes a
connection failure case work like a disconnected case.
bug:
2378462
Grace Kloba [Thu, 21 Jan 2010 03:20:57 +0000 (19:20 -0800)]
Grace Kloba [Thu, 21 Jan 2010 01:38:18 +0000 (17:38 -0800)]
DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.
Fix http://b/issue?id=
2385061
Mike Reed [Thu, 21 Jan 2010 02:35:24 +0000 (18:35 -0800)]
am
a66baccc: Merge "Do not merge" into eclair
Merge commit '
a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp
* commit '
a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
Do not merge
Mike Reed [Thu, 21 Jan 2010 02:32:32 +0000 (18:32 -0800)]
Merge "Do not merge" into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 01:54:12 +0000 (17:54 -0800)]
am
d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."
Merge commit '
d1da5fa2da9690be94929e391a4e66b9986573bc' into eclair-plus-aosp
* commit '
d1da5fa2da9690be94929e391a4e66b9986573bc':
Revert "SDK doc change: Add doc update for NDKr3."
Xavier Ducrohet [Thu, 21 Jan 2010 01:45:18 +0000 (17:45 -0800)]
Revert "SDK doc change: Add doc update for NDKr3."
This reverts commit
1dced50963312c5d340cbd129d0017d9cbb45f0b.
Irfan Sheriff [Thu, 21 Jan 2010 01:44:07 +0000 (17:44 -0800)]
Use MCC value to always override channel count setting
FCC raised the issue of not allowing users to configure
channel counts beyond 11. This change enforces the channel
count based on MCC values.
Bug:
2378844
Grace Kloba [Thu, 21 Jan 2010 01:40:30 +0000 (17:40 -0800)]
am
89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit '
89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp
* commit '
89e3c1ab017717b619b27ca312d87918981004ca':
Fix the sloppy detection in the ScaleGestureDetector.
Grace Kloba [Thu, 21 Jan 2010 01:36:50 +0000 (17:36 -0800)]
Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Grace Kloba [Wed, 20 Jan 2010 22:10:31 +0000 (14:10 -0800)]
Fix the sloppy detection in the ScaleGestureDetector.
Fix http://b/issue?id=
2385061
Xavier Ducrohet [Thu, 21 Jan 2010 01:33:49 +0000 (17:33 -0800)]
am
38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair
Merge commit '
38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d' into eclair-plus-aosp
* commit '
38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d':
SDK doc change: Add doc update for NDKr3.
Xavier Ducrohet [Thu, 21 Jan 2010 01:30:27 +0000 (17:30 -0800)]
Merge "SDK doc change: Add doc update for NDKr3." into eclair
Scott Main [Thu, 21 Jan 2010 01:15:09 +0000 (17:15 -0800)]
am
2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Merge commit '
2a79defa5a0481e4dd980938da13adc767e0b231' into eclair-plus-aosp
* commit '
2a79defa5a0481e4dd980938da13adc767e0b231':
docs: add guide to copying and installing the Dev Tools app
Scott Main [Thu, 21 Jan 2010 01:10:25 +0000 (17:10 -0800)]
Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Scott Main [Wed, 20 Jan 2010 22:11:56 +0000 (14:11 -0800)]
docs: add guide to copying and installing the Dev Tools app
from the emulator to a device.
Irfan Sheriff [Wed, 20 Jan 2010 21:30:17 +0000 (13:30 -0800)]
am
48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
Merge commit '
48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp
* commit '
48ef378d01b3ace349cbb6ba564276b854d872c9':
DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Robert Greenwalt [Wed, 20 Jan 2010 21:30:11 +0000 (13:30 -0800)]
am
1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Merge commit '
1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp
* commit '
1a337547d5377c57dbb10a24d4d73ad6bda829ea':
Add bugreport info about network feature use. DO NOT MERGE
Mike Reed [Wed, 20 Jan 2010 14:38:04 +0000 (09:38 -0500)]
Do not merge
port stretchy from master
Irfan Sheriff [Wed, 20 Jan 2010 21:26:08 +0000 (13:26 -0800)]
Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
Robert Greenwalt [Wed, 20 Jan 2010 21:26:04 +0000 (13:26 -0800)]
Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Mike Reed [Wed, 20 Jan 2010 21:21:26 +0000 (13:21 -0800)]
am
9f954cf2: Merge "Do not merge" into eclair
Merge commit '
9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp
* commit '
9f954cf27e9e2bb94c836b1686c0e07500234b27':
Do not merge
Mike Reed [Wed, 20 Jan 2010 21:17:49 +0000 (13:17 -0800)]
Merge "Do not merge" into eclair
Robert Greenwalt [Tue, 22 Dec 2009 02:24:07 +0000 (18:24 -0800)]
Add bugreport info about network feature use. DO NOT MERGE
Backported from master change Ib9285359.
We've had a couple bug reports showing the effects of a left-live feature request.
We need a bit more bugreport-time logging.
bug:
2323226
bug:
2377507
change-id: I296b2887101c260aea678bf6db91144535cbad7e
Robert Greenwalt [Wed, 20 Jan 2010 19:12:40 +0000 (11:12 -0800)]
am
8c166512: Merge "Cleanup of process-specific DNS." into eclair
Merge commit '
8c166512a7e6ffaf87e41cd3a85d55993648fe9b' into eclair-plus-aosp
* commit '
8c166512a7e6ffaf87e41cd3a85d55993648fe9b':
Cleanup of process-specific DNS.
Robert Greenwalt [Wed, 20 Jan 2010 19:08:13 +0000 (11:08 -0800)]
Merge "Cleanup of process-specific DNS." into eclair
Irfan Sheriff [Fri, 8 Jan 2010 17:36:04 +0000 (09:36 -0800)]
DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Multiple broadcast receiver unregister calls cause exception.
Bug:
2361335
Mike Lockwood [Wed, 20 Jan 2010 18:04:13 +0000 (10:04 -0800)]
am
bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
Merge commit '
bb79e5fdb52eb86963fc688e6a455451b6e1a867' into eclair-plus-aosp
* commit '
bb79e5fdb52eb86963fc688e6a455451b6e1a867':
Be tolerant of GPS session and engine on status messages arriving out of order.
Mike Lockwood [Wed, 20 Jan 2010 18:00:55 +0000 (10:00 -0800)]
Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
Xavier Ducrohet [Wed, 20 Jan 2010 17:47:06 +0000 (09:47 -0800)]
am
b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Merge commit '
b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp
* commit '
b44051eee04450888a7dcb1cd2e6f31d0edfb678':
ADT/Layoutlib: implement sweep gradient.
Xavier Ducrohet [Wed, 20 Jan 2010 17:43:46 +0000 (09:43 -0800)]
Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Mike Lockwood [Wed, 20 Jan 2010 15:14:54 +0000 (10:14 -0500)]
Be tolerant of GPS session and engine on status messages arriving out of order.
BUG:
2366194
Change-Id: I642dacd397202f671adba5a863394438ca62988d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Scott Main [Wed, 20 Jan 2010 03:59:24 +0000 (19:59 -0800)]
am
5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file
Merge commit '
5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp
* commit '
5615ca1979caa79041bf16a2cae49f9cfadd7ee5':
docs: a lot of revision and expansion of the hello view tutorials
Adam Powell [Wed, 20 Jan 2010 03:59:19 +0000 (19:59 -0800)]
am
5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Merge commit '
5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp
* commit '
5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
Edge of screen slop detection for ScaleGestureDetector.
Scott Main [Wed, 20 Jan 2010 03:59:13 +0000 (19:59 -0800)]
am
de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
Merge commit '
de54a95b98b9d80c10ca2788b83386094222cb4f' into eclair-plus-aosp
* commit '
de54a95b98b9d80c10ca2788b83386094222cb4f':
docs: add a section about debugging web pages with the Console APIs;
Dianne Hackborn [Wed, 20 Jan 2010 03:59:04 +0000 (19:59 -0800)]
am
b1c4a2a3: Fix issue #
2364506: Phone locked up while listening to music and attempting to download an update
Merge commit '
b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7' into eclair-plus-aosp
* commit '
b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7':
Fix issue #
2364506: Phone locked up while listening to music and attempting to download an update
Scott Main [Wed, 16 Dec 2009 03:38:16 +0000 (19:38 -0800)]
docs: a lot of revision and expansion of the hello view tutorials
includes new screenshots for some tutorials and a new sample images
zip file
Bug:
2338253
Xavier Ducrohet [Wed, 20 Jan 2010 02:51:06 +0000 (18:51 -0800)]
ADT/Layoutlib: implement sweep gradient.
Change-Id: I2d460decff82f5f64b0a5cfeaa68156aad4fb3e6
Robert Greenwalt [Thu, 17 Dec 2009 22:54:59 +0000 (14:54 -0800)]
Cleanup of process-specific DNS.
Backport of MR2 change
421c72b6.
Removes entries sooner. A bug.
Doesn't add one for phone process at all. This was intended to be removed long ago.
bug:
2329900
bug:
2377507
Adam Powell [Wed, 20 Jan 2010 00:40:17 +0000 (16:40 -0800)]
Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Adam Powell [Wed, 20 Jan 2010 00:33:46 +0000 (16:33 -0800)]
Edge of screen slop detection for ScaleGestureDetector.
Scott Main [Wed, 20 Jan 2010 00:18:52 +0000 (16:18 -0800)]
Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
Scott Main [Sat, 16 Jan 2010 01:26:29 +0000 (17:26 -0800)]
docs: add a section about debugging web pages with the Console APIs;
revise and cleanup some of the other content.
Bug:
2353529
Dianne Hackborn [Tue, 19 Jan 2010 23:36:42 +0000 (15:36 -0800)]
Fix issue #
2364506: Phone locked up while listening to music and attempting to download an update
Make sure calls into the notification manager are not done with the
activity manager lock held.
Change-Id: Ib53c3b9f46160d94ee1e7079b1a5123e0d1225d8
Xavier Ducrohet [Tue, 19 Jan 2010 22:53:52 +0000 (14:53 -0800)]
am
6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair
Merge commit '
6866daee6a18992e8f2c9a948e873bbfc2090fb0' into eclair-plus-aosp
* commit '
6866daee6a18992e8f2c9a948e873bbfc2090fb0':
ADT/Layoutlib: implement radial gradient.
Ying Wang [Tue, 19 Jan 2010 22:53:47 +0000 (14:53 -0800)]
am
b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair
Merge commit '
b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp
* commit '
b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
Add instrumentation as a source tag for proguard keep options.
Xavier Ducrohet [Tue, 19 Jan 2010 22:48:58 +0000 (14:48 -0800)]
Merge "ADT/Layoutlib: implement radial gradient." into eclair
Xavier Ducrohet [Tue, 19 Jan 2010 18:20:43 +0000 (10:20 -0800)]
ADT/Layoutlib: implement radial gradient.
Also refactored some parts of LinearGradient to reuse them
in the radial gradient
Change-Id: I2ec69bd60190bd014217d989177dcc7269188dea
Mike Reed [Tue, 19 Jan 2010 21:38:53 +0000 (16:38 -0500)]
Do not merge
roll 1-line fix from master here. Fixes crasher when apps use custom fonts
fixes http://code.google.com/p/android/issues/detail?id=6030
Ying Wang [Tue, 19 Jan 2010 19:55:12 +0000 (11:55 -0800)]
Merge "Add instrumentation as a source tag for proguard keep options." into eclair
Guang Zhu [Tue, 19 Jan 2010 19:54:05 +0000 (11:54 -0800)]
am
ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
Merge commit '
ccec75e7a842f8ba26617406768206eb3be32222' into eclair-plus-aosp
* commit '
ccec75e7a842f8ba26617406768206eb3be32222':
Prevent orientation change from triggering activity recreation.
Amith Yamasani [Tue, 19 Jan 2010 19:53:59 +0000 (11:53 -0800)]
am
b35b8c13: Merge "Security fix in accessibility - don\'t read out password. #
2371557" into eclair
Merge commit '
b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp
* commit '
b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
Security fix in accessibility - don't read out password. #
2371557
Guang Zhu [Tue, 19 Jan 2010 19:53:00 +0000 (11:53 -0800)]
Merge "Prevent orientation change from triggering activity recreation." into eclair
Guang Zhu [Tue, 19 Jan 2010 19:51:44 +0000 (11:51 -0800)]
Prevent orientation change from triggering activity recreation.
Amith Yamasani [Tue, 19 Jan 2010 19:50:39 +0000 (11:50 -0800)]
Merge "Security fix in accessibility - don't read out password. #
2371557" into eclair
Scott Main [Tue, 19 Jan 2010 19:21:58 +0000 (11:21 -0800)]
am
88e653f6: Merge "docs: some spelling typos" into eclair
Merge commit '
88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp
* commit '
88e653f6653aeb237631681f6700f0e572779617':
docs: some spelling typos
Scott Main [Tue, 19 Jan 2010 19:18:39 +0000 (11:18 -0800)]
Merge "docs: some spelling typos" into eclair
Scott Main [Tue, 19 Jan 2010 19:12:07 +0000 (11:12 -0800)]
docs: some spelling typos
Mike Lockwood [Tue, 19 Jan 2010 16:48:14 +0000 (11:48 -0500)]
LocationManagerService: Fix bug removing proximity alerts.
Alerts were not being removed from the mProximitiesEntered array.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Grace Kloba [Tue, 19 Jan 2010 07:43:37 +0000 (23:43 -0800)]
Grace Kloba [Tue, 19 Jan 2010 07:43:32 +0000 (23:43 -0800)]
Grace Kloba [Tue, 19 Jan 2010 07:43:27 +0000 (23:43 -0800)]
Grace Kloba [Tue, 19 Jan 2010 07:43:20 +0000 (23:43 -0800)]
am
d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
Merge commit '
d79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp
* commit '
d79d1c72991e587294432e80d091e3ae26a0c103':
If ZoomButttonsController detects more than one pointer,
Grace Kloba [Tue, 19 Jan 2010 07:43:14 +0000 (23:43 -0800)]
am
f080a5ad: Merge "DO NOT MERGE" into eclair
Merge commit '
f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp
* commit '
f080a5adf6d59bade46815ee605a3829e5c3ab89':
DO NOT MERGE
Jim Miller [Tue, 19 Jan 2010 07:43:01 +0000 (23:43 -0800)]
am
813d2d86: Merge "Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Merge commit '
813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp
* commit '
813d2d86789d1c2e705c4d11d052ad649e6bac84':
Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
Xavier Ducrohet [Tue, 19 Jan 2010 07:42:55 +0000 (23:42 -0800)]
am
908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
Merge commit '
908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp
* commit '
908a81119061092468067789acbec9b99d79ad5f':
ADT/Layoutlib: Add dash support to stroke.
OSDN Git Service
