OSDN Git Service
Grace Kloba [Fri, 22 Jan 2010 20:38:50 +0000 (12:38 -0800)]
Eric Laurent [Fri, 22 Jan 2010 18:14:26 +0000 (10:14 -0800)]
Merge "Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
Eric Laurent [Fri, 22 Jan 2010 15:50:58 +0000 (07:50 -0800)]
Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion.
The problem occurs if the delay between the headset removal and insertion is less than one second.
In this case, as the headset disconnection intent is broadcast with a 1 second delay to allow music to pause
before updating the route, the connection intent is broadcast before and is ignored, leaving the system
in a state where the headset is considered disconnected.
The fix consists in inserting a delay before broadcasting the connection intent if a disconnection
intent is pending broadcast.
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: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: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
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: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
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 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: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:30:05 +0000 (23:30 -0800)]
Merge "DO NOT MERGE" into eclair
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: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 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:32:32 +0000 (18:32 -0800)]
Merge "Do not merge" into eclair
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: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:30:27 +0000 (17:30 -0800)]
Merge "SDK doc change: Add doc update for NDKr3." into eclair
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.
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: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: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: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: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, 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: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: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: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
Grace Kloba [Sat, 16 Jan 2010 01:11:27 +0000 (17:11 -0800)]
DO NOT MERGE
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
Grace Kloba [Sat, 16 Jan 2010 00:08:17 +0000 (16:08 -0800)]
DO NOT MERGE
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.
This should fix the weird state Bart got in with
m.wikipedia.org.
Grace Kloba [Sat, 16 Jan 2010 00:02:57 +0000 (16:02 -0800)]
DO NOT MERGE
Remove testing (enable plugin) code.
No reflow when zoom in, auto reflow when zoom out.
Fix http://b/issue?id=
2375955
Grace Kloba [Mon, 18 Jan 2010 23:21:38 +0000 (15:21 -0800)]
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
Grace Kloba [Mon, 18 Jan 2010 23:21:31 +0000 (15:21 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Mon, 18 Jan 2010 18:43:59 +0000 (10:43 -0800)]
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.
Jim Miller [Sat, 16 Jan 2010 01:20:29 +0000 (17:20 -0800)]
Merge "Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Grace Kloba [Sat, 16 Jan 2010 00:35:40 +0000 (16:35 -0800)]
DO NOT MERGE
Bring back +/- when panning. Dismiss it when pinching.
Jim Miller [Sat, 16 Jan 2010 00:20:36 +0000 (16:20 -0800)]
Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent.
Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.
Instead, we'll handle this separately in lockscreen.
Xavier Ducrohet [Fri, 15 Jan 2010 22:27:34 +0000 (14:27 -0800)]
Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 19:24:44 +0000 (11:24 -0800)]
ADT/Layoutlib: Add dash support to stroke.
Change-Id: I09a7e84948be013cbb11f6d9774ab81df897b424
Xavier Ducrohet [Fri, 15 Jan 2010 18:30:52 +0000 (10:30 -0800)]
Merge "ADT/Layoutlib: properly handle stroke information." into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 03:19:06 +0000 (19:19 -0800)]
ADT/Layoutlib: properly handle stroke information.
Change-Id: Iec9284d0e65d1313739e361d1fd5a522646fd1fd
Grace Kloba [Fri, 15 Jan 2010 03:29:09 +0000 (19:29 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Fri, 15 Jan 2010 03:28:55 +0000 (19:28 -0800)]
Merge "DO NOT MERGE" into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 03:10:44 +0000 (19:10 -0800)]
Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
Amith Yamasani [Fri, 15 Jan 2010 02:56:02 +0000 (18:56 -0800)]
Security fix in accessibility - don't read out password. #
2371557
Check for password type before send accessibility event.
[Submitting for Svet]
Xavier Ducrohet [Fri, 15 Jan 2010 02:45:04 +0000 (18:45 -0800)]
ADT/Layoutlib: improved gradient drawing for perf.
Change-Id: I79b909d7787e4442e7cfdf196de1ac0c077da7f8
Xavier Ducrohet [Fri, 15 Jan 2010 02:37:21 +0000 (18:37 -0800)]
ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
Change-Id: I298d00208ace2421478c5864cc5a66a508b2b411
Xavier Ducrohet [Fri, 15 Jan 2010 02:36:26 +0000 (18:36 -0800)]
Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
Grace Kloba [Fri, 15 Jan 2010 02:30:45 +0000 (18:30 -0800)]
DO NOT MERGE
When adjust scale for zoom overview, keep the state
of whether textWrapScale is matching mActualScale.
So if user pinch during loading, we won't reflow.
Fix http://b/issue?id=
2370552
Grace Kloba [Fri, 15 Jan 2010 02:18:41 +0000 (18:18 -0800)]
DO NOT MERGE
If mViewportWidth is 0, it means screen width. If
textwrapWidth is not same as view width, which means
that we are in the state triggered by pinch, always
send textwrapWidth as width to WebKit to keep the
same layout.
Fix http://b/issue?id=
2375232
Roman Nurik [Fri, 15 Jan 2010 01:18:31 +0000 (17:18 -0800)]
Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 01:14:05 +0000 (17:14 -0800)]
ADT/Layoutlib: always use custom gradient (java) Paint.
The normal linear paint from AWT does not support our TileModes.
Change-Id: I24667671dabdf1a5dffa342e4de9cc69487db0b6
Xavier Ducrohet [Fri, 15 Jan 2010 01:15:56 +0000 (17:15 -0800)]
Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
John Wang [Fri, 15 Jan 2010 00:43:38 +0000 (16:43 -0800)]
Merge "Add Event log for RAT switch." into eclair
Roman Nurik [Fri, 8 Jan 2010 20:48:45 +0000 (12:48 -0800)]
Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
Joe Onorato [Thu, 14 Jan 2010 23:53:45 +0000 (15:53 -0800)]
Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair
Xavier Ducrohet [Thu, 14 Jan 2010 23:15:35 +0000 (15:15 -0800)]
ADT/Layout: support for 3+ color in linear gradients
Change-Id: I14c6a5a1de41470c6f1c66d490492ecc727302f2
Scott Main [Thu, 14 Jan 2010 21:01:30 +0000 (13:01 -0800)]
Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug:
2374363,
2374334" into eclair
Joe Onorato [Thu, 14 Jan 2010 20:59:35 +0000 (15:59 -0500)]
add drawSpriteScreenspaceCropped to renderscript
Scott Main [Thu, 14 Jan 2010 20:03:23 +0000 (12:03 -0800)]
docs: remove dev guide link from download confirmation content
so we only link to the install guide and re-affirm the system reqs
bug:
2374363,
2374334
Xavier Ducrohet [Thu, 14 Jan 2010 18:30:16 +0000 (10:30 -0800)]
ADT/Layoutlib: shader clean-up.
Change-Id: I0a200f438b7ccde2bfc19fd23614a647cb19d312
Xavier Ducrohet [Thu, 14 Jan 2010 18:03:56 +0000 (10:03 -0800)]
Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair
Grace Kloba [Thu, 14 Jan 2010 17:29:52 +0000 (09:29 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Thu, 14 Jan 2010 02:02:09 +0000 (18:02 -0800)]
DO NOT MERGE
Use the common ScaleGestureDetector to detect the
multi-touch motion.
Check both supportZoom and getBuiltInZoomControls
to decide whether enable the multi-touch behavior.
This should the new pinch behavior only replace the
old +/-.
Fix http://b/issue?id=
2363260
Only update textWrapScale if it is different. This
should fix the performance decrease caused by initial
multi-touch code.
Fix http://b/issue?id=
2371694
Xavier Ducrohet [Thu, 14 Jan 2010 04:30:26 +0000 (20:30 -0800)]
ADT/Layoutlib: 2 color, linear gradient support.
Change-Id: Ifaafa4fc42a22f4851449a7c35a5b82e211aafe7
Xavier Ducrohet [Thu, 14 Jan 2010 03:14:28 +0000 (19:14 -0800)]
Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair
Xavier Ducrohet [Thu, 14 Jan 2010 02:06:00 +0000 (18:06 -0800)]
ADT/Layoutlib: implement Canvas.concat(Matrix)
This prevented ImageView from making proper use of ScaleType.
Also fixed Canvas.getSaveCount() that returned the wrong
value and Matrix.getTransform() which used the wrong order
for the AffineTransform constructor!!
Bug:
2364564
Change-Id: I78babf4aa6689440e52ad06b1473f75b20eb66da
Adam Powell [Thu, 14 Jan 2010 02:00:35 +0000 (18:00 -0800)]
Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can't reliably handle translation and scaling at the same time." into eclair