OSDN Git Service
Scott Main [Mon, 23 Nov 2009 21:09:17 +0000 (13:09 -0800)]
am
3fa1cb05: am
5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '
3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-mr2
* commit '
3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
droiddoc change: add flag to offline docs build to signal
Scott Main [Mon, 23 Nov 2009 21:04:27 +0000 (13:04 -0800)]
am
5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '
5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair
* commit '
5e7f1fbe161d7015dde6e893351238749f906c8a':
droiddoc change: add flag to offline docs build to signal
Android (Google) Code Review [Mon, 23 Nov 2009 20:56:19 +0000 (12:56 -0800)]
Merge change Id2ee762d into eclair-sdk
* changes:
droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
Android (Google) Code Review [Mon, 23 Nov 2009 20:20:04 +0000 (12:20 -0800)]
Merge change I60dfecdc into eclair-mr2
* changes:
Add window manager support for overriding button and keyboard backlight values.
Android (Google) Code Review [Mon, 23 Nov 2009 20:07:20 +0000 (12:07 -0800)]
Merge change I8ae1b41a into eclair-mr2
* changes:
Expose some debugging tools of the WebView.
Dan Egnor [Mon, 23 Nov 2009 20:03:47 +0000 (12:03 -0800)]
am
9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '
9854deae10aaf39999a95e440ee3dec939d47179' into eclair-mr2
* commit '
9854deae10aaf39999a95e440ee3dec939d47179':
Add CPUFREQ_STATS event tag
Android (Google) Code Review [Mon, 23 Nov 2009 19:57:08 +0000 (11:57 -0800)]
Merge change I1691f3d3 into eclair
* changes:
Add CPUFREQ_STATS event tag DO NOT MERGE
Eric Laurent [Mon, 23 Nov 2009 19:16:27 +0000 (11:16 -0800)]
am
a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '
a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-mr2
* commit '
a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
Android (Google) Code Review [Mon, 23 Nov 2009 19:11:55 +0000 (11:11 -0800)]
Merge change I2083b297 into eclair
* changes:
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
Dianne Hackborn [Mon, 23 Nov 2009 19:05:54 +0000 (11:05 -0800)]
am
8abd5f0d: Fix issue #
2267665 IME keyboard appears as Blank in compose view...
Merge commit '
8abd5f0d519afa787e7c64e429df17ccc661ce75' into eclair-mr2
* commit '
8abd5f0d519afa787e7c64e429df17ccc661ce75':
Fix issue #
2267665 IME keyboard appears as Blank in compose view...
Android (Google) Code Review [Mon, 23 Nov 2009 18:46:25 +0000 (10:46 -0800)]
Merge change Ib1b7bce4 into eclair-mr2
* changes:
Squashed commit of the following:
Mike Lockwood [Mon, 23 Nov 2009 18:40:13 +0000 (10:40 -0800)]
am
174b7269: Merge change Id886fb28 into eclair
Merge commit '
174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2
* commit '
174b726917c12d61f9135a180afc8413d845dc2d':
Fix deadlock in WindowManagerService.reenableKeyguard()
Android (Google) Code Review [Mon, 23 Nov 2009 18:36:32 +0000 (10:36 -0800)]
Merge change Id886fb28 into eclair
* changes:
Fix deadlock in WindowManagerService.reenableKeyguard()
Android (Google) Code Review [Mon, 23 Nov 2009 18:10:51 +0000 (10:10 -0800)]
Merge change I494a1dc5 into eclair-mr2
* changes:
Add OperationScheduler (and test) to the common static library; includes new string parsing function (and test).
Daniel Sandler [Mon, 23 Nov 2009 16:44:27 +0000 (08:44 -0800)]
am
a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '
a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2
* commit '
a59a01ab2b959a8a5aeb09dd664d5be193fd8219':
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Android (Google) Code Review [Mon, 23 Nov 2009 16:39:24 +0000 (08:39 -0800)]
Merge change I43f72dd1 into eclair
* changes:
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Jaikumar Ganesh [Mon, 23 Nov 2009 06:02:17 +0000 (22:02 -0800)]
am
ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '
ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2
* commit '
ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
Android (Google) Code Review [Mon, 23 Nov 2009 05:54:29 +0000 (21:54 -0800)]
Merge change Ia3acc2ee into eclair
* changes:
Fix pairings lost on reboot.
Dan Egnor [Sat, 21 Nov 2009 02:31:33 +0000 (18:31 -0800)]
Add OperationScheduler (and test) to the common static library;
includes new string parsing function (and test).
Eric Laurent [Sat, 21 Nov 2009 08:21:15 +0000 (00:21 -0800)]
am
e7800946: Merge change I49f02be9 into eclair
Merge commit '
e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2
* commit '
e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue
2265163: Audio still reported routed through earpiece on sholes
Android (Google) Code Review [Sat, 21 Nov 2009 08:18:24 +0000 (00:18 -0800)]
Merge change I49f02be9 into eclair
* changes:
Issue
2265163: Audio still reported routed through earpiece on sholes
Scott Main [Sat, 21 Nov 2009 01:08:09 +0000 (17:08 -0800)]
am
256da9fb: am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-mr2
* commit '
256da9fb007ac0722a5b1854befda7e7bed2564e':
docs change for ESR: add platform notes document for
Scott Main [Sat, 21 Nov 2009 01:03:29 +0000 (17:03 -0800)]
am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
160ab363d738728456d561bb80d54d3448e7580a' into eclair
* commit '
160ab363d738728456d561bb80d54d3448e7580a':
docs change for ESR: add platform notes document for
Android (Google) Code Review [Sat, 21 Nov 2009 00:59:57 +0000 (16:59 -0800)]
Merge change I0c172ebf into eclair-sdk
* changes:
docs change for ESR: add platform notes document for Android 2.0.1. Also update the homepage sdk and adp announcements.
Dianne Hackborn [Sat, 21 Nov 2009 00:43:20 +0000 (16:43 -0800)]
am
af1f42be: Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '
af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2
* commit '
af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Dianne Hackborn [Fri, 20 Nov 2009 23:20:34 +0000 (15:20 -0800)]
am
1824ec8c: Merge change If2b0bbed into eclair
Merge commit '
1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2
* commit '
1824ec8c127e3a8ef602d027e3c10d81f28320e8':
Debugging for issue #
2228381 android.view.InflateException
Android (Google) Code Review [Fri, 20 Nov 2009 23:12:33 +0000 (15:12 -0800)]
Merge change If2b0bbed into eclair
* changes:
Debugging for issue #
2228381 android.view.InflateException
Android (Google) Code Review [Fri, 20 Nov 2009 22:56:21 +0000 (14:56 -0800)]
Merge change I3ae1fb19 into eclair-mr2
* changes:
Increase the default wake lock timeout.
Dianne Hackborn [Fri, 20 Nov 2009 22:26:42 +0000 (14:26 -0800)]
Debugging for issue #
2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)
Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
Evan Millar [Fri, 20 Nov 2009 22:22:30 +0000 (14:22 -0800)]
am
633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '
633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-mr2
* commit '
633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
Move updated 6.xml from eclair-sholes-release into eclair
Mike Lockwood [Fri, 20 Nov 2009 21:32:17 +0000 (13:32 -0800)]
am
a1ce6551: Merge change I69324a33 into eclair
Merge commit '
a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2
* commit '
a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
AlarmManagerService: Fix daylight savings time offset computation
Android (Google) Code Review [Fri, 20 Nov 2009 21:28:12 +0000 (13:28 -0800)]
Merge change I69324a33 into eclair
* changes:
AlarmManagerService: Fix daylight savings time offset computation
Dirk Dougherty [Fri, 20 Nov 2009 21:13:25 +0000 (13:13 -0800)]
am
055b4392: Merge change I0a17a960 into eclair
Merge commit '
055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2
* commit '
055b439289f38c5a1d3bd43c0e218a4cbb93773d':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Android (Google) Code Review [Fri, 20 Nov 2009 21:08:06 +0000 (13:08 -0800)]
Merge change I0a17a960 into eclair
* changes:
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Yu Shan Emily Lau [Fri, 20 Nov 2009 20:03:34 +0000 (12:03 -0800)]
am
9ed314ce: Merge change Ib3191441 into eclair
Merge commit '
9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2
* commit '
9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
Android (Google) Code Review [Fri, 20 Nov 2009 19:59:28 +0000 (11:59 -0800)]
Merge change Ib3191441 into eclair
* changes:
Add the checking for mediaplayer stress test.
Scott Main [Fri, 20 Nov 2009 18:00:55 +0000 (10:00 -0800)]
am
2a6a149f: am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2
* commit '
2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 18:00:28 +0000 (10:00 -0800)]
am
e1611399: am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2
* commit '
e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Scott Main [Fri, 20 Nov 2009 17:54:52 +0000 (09:54 -0800)]
am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair
* commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 17:54:22 +0000 (09:54 -0800)]
am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Eric Laurent [Thu, 19 Nov 2009 17:00:56 +0000 (09:00 -0800)]
Issue
2265163: Audio still reported routed through earpiece on sholes
This is a second attempt to fix the audio routed to earpiece syndrom.
The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type.
When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop.
Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece.
The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet.
The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal.
The same modification is made for AudioRecord although no bug related to record has been reported yet.
Also fixed a potential problem if record stop is called while the record thread is exiting.
Android (Google) Code Review [Fri, 20 Nov 2009 07:14:37 +0000 (23:14 -0800)]
Merge change I903ce7b1 into eclair-mr2
* changes:
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Joe Onorato [Fri, 20 Nov 2009 05:20:18 +0000 (21:20 -0800)]
am
57bda83d: Merge change I4f614c9e into eclair
Merge commit '
57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2
* commit '
57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Android (Google) Code Review [Fri, 20 Nov 2009 04:17:06 +0000 (20:17 -0800)]
Merge change I4f614c9e into eclair
* changes:
Add a test app that has 100 icons. None of them do anything when clicked.
Mathias Agopian [Fri, 20 Nov 2009 03:07:36 +0000 (19:07 -0800)]
am
13feccf5: Merge change I39f0003e into eclair
Merge commit '
13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2
* commit '
13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
fix [
2235414] libagl glDeleteBuffers() crashes
Android (Google) Code Review [Fri, 20 Nov 2009 03:03:53 +0000 (19:03 -0800)]
Merge change I39f0003e into eclair
* changes:
fix [
2235414] libagl glDeleteBuffers() crashes
Android (Google) Code Review [Fri, 20 Nov 2009 02:50:48 +0000 (18:50 -0800)]
Merge change I27b1bb90 into eclair-mr2
* changes:
Refactor vCard test code and modify unit tests.
Dianne Hackborn [Fri, 20 Nov 2009 02:06:06 +0000 (18:06 -0800)]
am
524812fb: Merge change I7d40ad9a into eclair
Merge commit '
524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2
* commit '
524812fbf583db5053ff56f7a146fa8fe9296742':
More on issue #
2271640: Fix wallpaper etc docs
Android (Google) Code Review [Fri, 20 Nov 2009 02:01:30 +0000 (18:01 -0800)]
Merge change I7d40ad9a into eclair
* changes:
More on issue #
2271640: Fix wallpaper etc docs
Mathias Agopian [Fri, 20 Nov 2009 01:32:05 +0000 (17:32 -0800)]
fix [
2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.
Mathias Agopian [Fri, 20 Nov 2009 00:29:30 +0000 (16:29 -0800)]
am
23aa34a7: Merge change I137dac6f into eclair
Merge commit '
23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2
* commit '
23aa34a743ae18e0d45b459f0c7010eb47a2147a':
backout a workaround that is not needed anymore
Mike Chan [Fri, 20 Nov 2009 00:23:56 +0000 (16:23 -0800)]
am
23b3ef82: Merge change I99194df1 into eclair
Merge commit '
23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-mr2
* commit '
23b3ef82c0c4175e8c953740306ee6b080dae8e7':
frameworks: base: dumpstate: Dump kernel cpufreq speeds.
Android (Google) Code Review [Fri, 20 Nov 2009 00:23:29 +0000 (16:23 -0800)]
Merge change I137dac6f into eclair
* changes:
backout a workaround that is not needed anymore
Android (Google) Code Review [Fri, 20 Nov 2009 00:18:51 +0000 (16:18 -0800)]
Merge change I99194df1 into eclair
* changes:
frameworks: base: dumpstate: Dump kernel cpufreq speeds.
Mathias Agopian [Thu, 19 Nov 2009 23:52:28 +0000 (15:52 -0800)]
backout a workaround that is not needed anymore
we had to add a call to glFinish() before glReadPixels() because of a bug in the GL ES
driver of a certain device. This is not needed anymore.
Mathias Agopian [Thu, 19 Nov 2009 23:47:37 +0000 (15:47 -0800)]
am
74a331b5: Merge change I4c29c948 into eclair
Merge commit '
74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2
* commit '
74a331b5dd1d39da44b608743c36ab3523f598d2':
fix [
2269022] The raw picture displayed post shutter seems to have low-resolution
Android (Google) Code Review [Thu, 19 Nov 2009 23:44:13 +0000 (15:44 -0800)]
Merge change I4c29c948 into eclair
* changes:
fix [
2269022] The raw picture displayed post shutter seems to have low-resolution
Andreas Huber [Thu, 19 Nov 2009 23:01:14 +0000 (15:01 -0800)]
am
f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit '
f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2
* commit '
f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Jason Sams [Thu, 19 Nov 2009 22:56:39 +0000 (14:56 -0800)]
am
ddac83a5: Fix extended logging for object dumping.
Merge commit '
ddac83a516e939b55f20b226365596760159c9df' into eclair-mr2
* commit '
ddac83a516e939b55f20b226365596760159c9df':
Fix extended logging for object dumping.
Android (Google) Code Review [Thu, 19 Nov 2009 22:52:57 +0000 (14:52 -0800)]
Merge change I8134d6ed into eclair
* changes:
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Mathias Agopian [Thu, 19 Nov 2009 22:46:26 +0000 (14:46 -0800)]
fix [
2269022] The raw picture displayed post shutter seems to have low-resolution
Make sure to always enable linear filtering in LayerBuffer. This change doesn't affect
devices using overlays.
Android (Google) Code Review [Thu, 19 Nov 2009 22:13:31 +0000 (14:13 -0800)]
Merge change I639b0f03 into eclair-mr2
* changes:
Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.
Android (Google) Code Review [Thu, 19 Nov 2009 21:47:24 +0000 (13:47 -0800)]
Merge change I86773fbb into eclair-mr2
* changes:
If overview width is the same as the current width, don't change the mode when double tap or zoom out.
Fred Quintana [Thu, 19 Nov 2009 19:41:48 +0000 (11:41 -0800)]
am
5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '
5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2
* commit '
5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
Dianne Hackborn [Thu, 19 Nov 2009 19:40:48 +0000 (11:40 -0800)]
Android (Google) Code Review [Thu, 19 Nov 2009 19:36:42 +0000 (11:36 -0800)]
Merge change I194f0808 into eclair-mr2
* changes:
Add Gservices flag so that Market can turn on performance logging for specific groups.
Dianne Hackborn [Thu, 19 Nov 2009 19:09:11 +0000 (11:09 -0800)]
am
23ef7b48: Fix most of issue #
2271640: Fix wallpaper etc docs
Merge commit '
23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-mr2
* commit '
23ef7b4836d66d31430fedee2aac36275bb30d4b':
Fix most of issue #
2271640: Fix wallpaper etc docs
Android (Google) Code Review [Thu, 19 Nov 2009 17:08:22 +0000 (09:08 -0800)]
Merge change I09e159ce into eclair-mr2
* changes:
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
Android (Google) Code Review [Thu, 19 Nov 2009 02:23:21 +0000 (18:23 -0800)]
Merge change Ifd754059 into eclair-mr2
* changes:
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Android (Google) Code Review [Thu, 19 Nov 2009 01:23:19 +0000 (17:23 -0800)]
Merge change I3a62e1c2 into eclair-mr2
* changes:
Solve the mutual interdependency problem between common and framework: Have framework include the common source files directly when building, then build common as a static library separately (depending on framework, like everything else).
Scott Main [Thu, 19 Nov 2009 01:18:16 +0000 (17:18 -0800)]
am
d2a9f54f: am
afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit '
d2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-mr2
* commit '
d2a9f54f9ec997562623091d404e0208fd9ce5f8':
docs: misc edits to samples page and intro docs
Scott Main [Thu, 19 Nov 2009 01:12:35 +0000 (17:12 -0800)]
am
afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit '
afcd516e3e6378aaf97ff44b0b9ea233223ded65' into eclair
* commit '
afcd516e3e6378aaf97ff44b0b9ea233223ded65':
docs: misc edits to samples page and intro docs
Jean-Michel Trivi [Thu, 19 Nov 2009 01:04:30 +0000 (17:04 -0800)]
am
a0e37e9d: Merge change I941136fd into eclair
Merge commit '
a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-mr2
* commit '
a0e37e9defea04e8c0d97828db02361fe511c53f':
Fix bug
2271468 Update the javadoc for MediaRecorder.AudioSource
Android (Google) Code Review [Thu, 19 Nov 2009 01:00:16 +0000 (17:00 -0800)]
Merge change I941136fd into eclair
* changes:
Fix bug
2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
Mike Lockwood [Thu, 19 Nov 2009 00:24:37 +0000 (16:24 -0800)]
am
03786b83: Merge change I813fdb7a into eclair
Merge commit '
03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-mr2
* commit '
03786b83bd02f8dd8e1049d333fbfdee395ac965':
Fixes for proximity sensor behavior:
Android (Google) Code Review [Thu, 19 Nov 2009 00:20:32 +0000 (16:20 -0800)]
Merge change I813fdb7a into eclair
* changes:
Fixes for proximity sensor behavior:
Android (Google) Code Review [Thu, 19 Nov 2009 00:11:35 +0000 (16:11 -0800)]
Merge change I8daabf26 into eclair-mr2
* changes:
Modify vCard exporter code so that it does not emit non-Ascii type.
Dianne Hackborn [Wed, 18 Nov 2009 23:12:59 +0000 (15:12 -0800)]
am
dfc066e7: Merge change I5ad37324 into eclair
Merge commit '
dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-mr2
* commit '
dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
Fix issue #
2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
Android (Google) Code Review [Wed, 18 Nov 2009 23:09:18 +0000 (15:09 -0800)]
Merge change I5ad37324 into eclair
* changes:
Fix issue #
2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
Dan Egnor [Wed, 18 Nov 2009 22:41:14 +0000 (14:41 -0800)]
Solve the mutual interdependency problem between common and framework:
Have framework include the common source files directly when building,
then build common as a static library separately (depending on
framework, like everything else).
Goes with a companion change to build/core/pathmap.mk.
Android (Google) Code Review [Wed, 18 Nov 2009 22:15:58 +0000 (14:15 -0800)]
Merge change Ic9e65818 into eclair-mr2
* changes:
Attempt to fix the build server build: make the common library not depend on the framework library (for now, at least).
Dan Egnor [Wed, 18 Nov 2009 22:14:10 +0000 (14:14 -0800)]
Attempt to fix the build server build: make the common library
not depend on the framework library (for now, at least).
Android (Google) Code Review [Wed, 18 Nov 2009 22:08:08 +0000 (14:08 -0800)]
Merge change Iaae72f66 into eclair-sdk
* changes:
docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
Jim Miller [Wed, 18 Nov 2009 21:32:01 +0000 (13:32 -0800)]
am
30142f7e: Merge change I9f239766 into eclair
Merge commit '
30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-mr2
* commit '
30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
Workaround for
2262578: Don't draw tabs if view is not in the correct orientation for the layout
Android (Google) Code Review [Wed, 18 Nov 2009 21:26:30 +0000 (13:26 -0800)]
Merge change I9f239766 into eclair
* changes:
Workaround for
2262578: Don't draw tabs if view is not in the correct orientation for the layout
Amith Yamasani [Wed, 18 Nov 2009 21:10:53 +0000 (13:10 -0800)]
am
778f1e65: Merge change Icfc893d2 into eclair
Merge commit '
778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2
* commit '
778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for
2267410 : Battery use doesn't show CPU usage on non-wiped devices
Android (Google) Code Review [Wed, 18 Nov 2009 20:40:44 +0000 (12:40 -0800)]
Merge change Icb1674f1 into eclair-mr2
* changes:
Create android-common static library which gets included in frameworks.jar, but can also be used by unbundled apps. Move android.text.util.Regex there as a starting example, renamed to a more sensible (?) com.android.common.Patterns. Set up a corresponding test package, and move RegexTest (to PatternsTest). Update clients.
Android (Google) Code Review [Wed, 18 Nov 2009 20:38:30 +0000 (12:38 -0800)]
Merge change Icfc893d2 into eclair
* changes:
Fix for
2267410 : Battery use doesn't show CPU usage on non-wiped devices
Dan Egnor [Wed, 18 Nov 2009 19:23:45 +0000 (11:23 -0800)]
Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps. Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
Dianne Hackborn [Wed, 18 Nov 2009 19:51:05 +0000 (11:51 -0800)]
am
1d62ea9d: Fix issue #
2249821: Unable to start passion in safe mode
Merge commit '
1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-mr2
* commit '
1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e':
Fix issue #
2249821: Unable to start passion in safe mode
Android (Google) Code Review [Wed, 18 Nov 2009 12:36:27 +0000 (04:36 -0800)]
Merge change Ibb994bd2 into eclair-mr2
* changes:
rename nativeFindIsDown to nativeFindIsUp; check for null webkit
Android (Google) Code Review [Wed, 18 Nov 2009 08:19:52 +0000 (00:19 -0800)]
Merge change I919c20bb into eclair-mr2
* changes:
Code clean up.
Jim Miller [Wed, 18 Nov 2009 06:58:23 +0000 (22:58 -0800)]
am
30998a59: Merge change I587dd820 into eclair
Merge commit '
30998a59aced3248b3a6f5e507dba0394fb54cad' into eclair-mr2
* commit '
30998a59aced3248b3a6f5e507dba0394fb54cad':
Fix
2268841: Much better looking layout for pattern lock screen.
Android (Google) Code Review [Wed, 18 Nov 2009 06:53:44 +0000 (22:53 -0800)]
Merge change I587dd820 into eclair
* changes:
Fix
2268841: Much better looking layout for pattern lock screen.
Android (Google) Code Review [Wed, 18 Nov 2009 05:54:59 +0000 (21:54 -0800)]
Merge change I0629175f into eclair-mr2
* changes:
Remove googleclient from the framework, and its classes from the preload list.
Android (Google) Code Review [Wed, 18 Nov 2009 02:02:12 +0000 (18:02 -0800)]
Merge change I24e47245 into eclair-mr2
* changes:
Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox. Optimize DropBoxManagerService.dump() a bit.
Eric Fischer [Wed, 18 Nov 2009 01:54:31 +0000 (17:54 -0800)]
am
04a0e969: Merge change Id7c432bf into eclair
Merge commit '
04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-mr2
* commit '
04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Android (Google) Code Review [Wed, 18 Nov 2009 01:51:37 +0000 (17:51 -0800)]
Merge change Id7c432bf into eclair
* changes:
Add vertical bar to the alt-space character picker for the hardware keyboard.
Android (Google) Code Review [Wed, 18 Nov 2009 01:38:07 +0000 (17:38 -0800)]
Merge change I60cfe9ce into eclair-mr2
* changes:
Add unit tests.
Jason Sams [Wed, 18 Nov 2009 01:35:44 +0000 (17:35 -0800)]
am
fa0394c9: Merge change I715333b8 into eclair
Merge commit '
fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-mr2
* commit '
fa0394c9f89f13b53c6db2470253825b88cafb64':
Add support for dumping RS objects to aid in debugging of white blocks bug.