12881 Commits

Author SHA1 Message Date
Android (Google) Code Review
ac3e2159b4 Merge change Icaf78440 into eclair-mr2
* changes:
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-16 21:31:49 -08:00
Daisuke Miyakawa
1b9e2bec63 Split vCard composer into two parts: VCardComposer and VCardBuilder.
As for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.
This time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.

Make Constants public and rename it to VCardConstants.

Internal issue number: 2242528, 2195990
2009-11-17 14:30:17 +09:00
Mike Lockwood
11c89c4828 am 0d829149: am f8c4af65: Merge change I51b84496 into eclair
Merge commit '0d829149292713f05b85f33fedaba88771627533' into eclair-mr2-plus-aosp

* commit '0d829149292713f05b85f33fedaba88771627533':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 20:05:53 -08:00
Scott Main
bc1add83e1 am 4b26bab8: am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '4b26bab8a455050b3d337725ab30ac2da0379cbe' into eclair-mr2-plus-aosp

* commit '4b26bab8a455050b3d337725ab30ac2da0379cbe':
  docs: remove all content from the older sdk download,
2009-11-16 20:05:38 -08:00
Mike Cleron
e5b5aa4903 am fd5cfd88: am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'fd5cfd885da4ee883153474d43e883aac7516023' into eclair-mr2-plus-aosp

* commit 'fd5cfd885da4ee883153474d43e883aac7516023':
  This time for sure: make wallpapers work
2009-11-16 20:05:17 -08:00
Dianne Hackborn
fe11d1a7a5 am 43e9eb28: am 9ddb7df8: Fix build.
Merge commit '43e9eb28ab9a246472149384567f505434f492a3' into eclair-mr2-plus-aosp

* commit '43e9eb28ab9a246472149384567f505434f492a3':
  Fix build.
2009-11-16 20:04:59 -08:00
Adam Bliss
1ff57418a7 am 34073369: am 69e0b664: Merge change I000d3564 into eclair
Merge commit '340733697fcb0b73a707eb544b958af3121cdf60' into eclair-mr2-plus-aosp

* commit '340733697fcb0b73a707eb544b958af3121cdf60':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 20:04:44 -08:00
Dianne Hackborn
003ac2c8e9 am beaf87bf: am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit 'beaf87bfec29378b27bd28c1d1d2c4db1116d7ce' into eclair-mr2-plus-aosp

* commit 'beaf87bfec29378b27bd28c1d1d2c4db1116d7ce':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 20:04:28 -08:00
Dianne Hackborn
3a624abe27 am 92b18800: am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12' into eclair-mr2-plus-aosp

* commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 20:04:09 -08:00
Mike Lockwood
0d82914929 am f8c4af65: Merge change I51b84496 into eclair
Merge commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6' into eclair-mr2

* commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:56:49 -08:00
Scott Main
4b26bab8a4 am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '06ddc67797388da6260e43579c7ebd506b5b376c' into eclair-mr2

* commit '06ddc67797388da6260e43579c7ebd506b5b376c':
  docs: remove all content from the older sdk download,
2009-11-16 19:56:30 -08:00
Mike Cleron
fd5cfd885d am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'f36b8f439babc141970b1207d1d9c12b7a14c468' into eclair-mr2

* commit 'f36b8f439babc141970b1207d1d9c12b7a14c468':
  This time for sure: make wallpapers work
2009-11-16 19:56:09 -08:00
Dianne Hackborn
43e9eb28ab am 9ddb7df8: Fix build.
Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-mr2

* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
  Fix build.
2009-11-16 19:55:53 -08:00
Adam Bliss
340733697f am 69e0b664: Merge change I000d3564 into eclair
Merge commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544' into eclair-mr2

* commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 19:55:31 -08:00
Dianne Hackborn
beaf87bfec am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb' into eclair-mr2

* commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 19:55:13 -08:00
Dianne Hackborn
92b1880084 am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-mr2

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 19:53:15 -08:00
Jack Palevich
8d0e147233 am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2
Merge commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5' into eclair-mr2-plus-aosp

* commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5':
  More GLSurfaceView cleanup.
2009-11-16 19:52:12 -08:00
Jack Palevich
a822f02bb9 resolved conflicts for merge of dc49acb0 to eclair-mr2 2009-11-17 11:39:54 +08:00
Android (Google) Code Review
f8c4af65e8 Merge change I51b84496 into eclair
* changes:
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:04:06 -08:00
Mike Lockwood
51b844965b Revert "PowerManagerService: enable logging for when mPowerState changes."
This reverts commit 24ace3395b532e3cbb63d2a6197a91dd9242bb36.

Bug b/2265538 (verbose logging from power manager)
2009-11-16 21:51:18 -05:00
Scott Main
06ddc67797 am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '00ecac957c4a5d2df132640ff418280d969e7d83' into eclair

* commit '00ecac957c4a5d2df132640ff418280d969e7d83':
  docs: remove all content from the older sdk download,
2009-11-16 18:25:56 -08:00
Android (Google) Code Review
00ecac957c Merge change If556e259 into eclair-sdk
* changes:
  docs: remove all content from the older sdk download, install, and requirements pages and redirect to the new sdk pages. Also update the "older sdks" doc to include all version-specific sdks. also update the robots file to disallow indexing of the old sdk docs.
2009-11-16 18:19:10 -08:00
Android (Google) Code Review
f36b8f439b Merge change Ia428b2c2 into eclair
* changes:
  This time for sure: make wallpapers work
2009-11-16 18:02:20 -08:00
Dianne Hackborn
9ddb7df88a Fix build.
Change-Id: I70c86738e2894d7f8c51034aea8fda1585a6fcb3
2009-11-16 17:59:32 -08:00
Android (Google) Code Review
69e0b6646f Merge change I000d3564 into eclair
* changes:
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 17:53:20 -08:00
Adam Bliss
000d356458 Move map tiles to no-dpi since they are dpi-independent. 2009-11-16 17:47:41 -08:00
Scott Main
8ef5a6b6ae docs: remove all content from the older sdk download,
install, and requirements pages and redirect to the new sdk
pages. Also update the "older sdks"
doc to include all version-specific sdks.
also update the robots file to disallow indexing
of the old sdk docs.
2009-11-16 17:39:52 -08:00
Jaikumar Ganesh
8c9dd7d8b9 Check if Bluetooth is enabled before making any calls down.
This was causing problems when apps were making calls, without
turning on BT first.

Bug: 2234918
Dr No: Eastham
2009-11-16 17:29:27 -08:00
Dianne Hackborn
60d7db4c3e Fix #2262593: 42 ANR reports from android.process.acore
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static.  A lot of code used it like it was per-instance,
but this would actually block all instances.  This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.

Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
2009-11-16 17:16:26 -08:00
Android (Google) Code Review
ab5efde8dc Merge change Iff5b8ce3 into eclair
* changes:
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 16:33:41 -08:00
Android (Google) Code Review
dc49acb028 Merge change Ica8c305a into eclair
* changes:
  More GLSurfaceView cleanup.
2009-11-16 15:48:47 -08:00
Andreas Huber
ea6a38c63b Squashed commit of the following:
commit 333057b355f8c260c549553b9a0634755c838b6a
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 13 15:35:48 2009 -0800

    Some more tweaks to AVC encoding on sholes.

commit 9981d0ee52ec5b8b0182aae733d1571e3ebb8390
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 12 16:36:57 2009 -0800

    Support for avc encoding, including sholes specific tweaks to pick the right colorspace for the camera to not require transcoding.

commit 5ba0ebbbd4efca51f3ae1f60e2ca31e7d2cf136d
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 11 09:50:03 2009 -0800

    Enable actual (camera) video-only recording using h.263 or mpeg4 encoding.

commit 3fd59c3526a37fe7c696f4a978925d1831c09313
Author: Andreas Huber <andih@google.com>
Date:   Tue Nov 10 14:57:48 2009 -0800

    Allow switching between the PV recorder implementation and one supported by stagefright.

    This is controlled through the property "media.stagefright.enable-record".
2009-11-16 15:43:38 -08:00
Jack Wang
e5fa335b0d am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b' into eclair-mr2-plus-aosp

* commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:29:15 -08:00
Jack Wang
6e045e0aa1 am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-mr2

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:25:06 -08:00
Android (Google) Code Review
e0cadd7cd8 Merge change Iffbb6e55 into eclair
* changes:
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:20:46 -08:00
Mathias Agopian
af3e233fe3 am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6' into eclair-mr2-plus-aosp

* commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6':
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:12:43 -08:00
Mathias Agopian
fc36afcba6 am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-mr2

* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:08:11 -08:00
Android (Google) Code Review
f998c4a289 Merge change I1c0bebbc into eclair
* changes:
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:05:16 -08:00
Jeff Sharkey
35d857002d am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2
Merge commit '8059bcbfa71c8233e616304843d9280f5f1615bb' into eclair-mr2-plus-aosp

* commit '8059bcbfa71c8233e616304843d9280f5f1615bb':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-16 14:55:37 -08:00
Mathias Agopian
1c0bebbc95 fix [2262591] Junk on screen in ERD46
since we're using the GPU for composition, don't use a texture for dimming,
instead simply use an alpha-blended quad.

also workaround what looks like a GL driver bug by calling glFinish() before
glReadPixels().
2009-11-16 14:55:36 -08:00
Jeff Sharkey
8059bcbfa7 resolved conflicts for merge of 1162fd77 to eclair-mr2 2009-11-16 14:49:07 -08:00
Jason Sams
234e509a67 am 22186a2c: am ec8178eb: Merge change I9c1bad53 into eclair
Merge commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0' into eclair-mr2-plus-aosp

* commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
2009-11-16 14:42:10 -08:00
Daisuke Miyakawa
d557614f3a am f016fa63: Merge change Ib1f7c3cb into eclair-mr2
Merge commit 'f016fa632b1d3c606934bc11a889af3921c6120e' into eclair-mr2-plus-aosp

* commit 'f016fa632b1d3c606934bc11a889af3921c6120e':
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-16 14:41:28 -08:00
Xavier Ducrohet
1bd7261d2b am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair
Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp

* commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b':
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 14:40:22 -08:00
Leon Scroggins
daf05d3e91 am a57632fe: Fix bugs around removing and attaching WebViews.
Merge commit 'a57632fee792d6078a7a61006f5a866c38addd33' into eclair-mr2-plus-aosp

* commit 'a57632fee792d6078a7a61006f5a866c38addd33':
  Fix bugs around removing and attaching WebViews.
2009-11-16 14:37:58 -08:00
Mike Lockwood
f6cee83f81 am 5fd01f7a: am fa82d97d: Merge change Ib1fb3fcf into eclair
Merge commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d' into eclair-mr2-plus-aosp

* commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d':
  Keep screen bright until boot completed.
2009-11-16 14:37:03 -08:00
Iliyan Malchev
7174fcf603 am f9bf75d5: am e2071c6b: Merge change I326e3e29 into eclair
Merge commit 'f9bf75d59acd8efb45d7137df507241483b1ad34' into eclair-mr2-plus-aosp

* commit 'f9bf75d59acd8efb45d7137df507241483b1ad34':
  dumpstate: include the contents of the last radio log
2009-11-16 14:36:37 -08:00
Daisuke Miyakawa
d5f787ab28 am 9e807d7c: Merge change Iecf85b40 into eclair-mr2
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp

* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
  Rename several files so that readers would not be confused.
2009-11-16 14:36:17 -08:00
Dan Egnor
8ad23618a2 am 92c12fae: Fix Zygote -- don\'t depend on these classes that are no longer in the bootclasspath. (This is a quick edit to the generated file; the next time the file is properly regenerated, it won\'t include these files.)
Merge commit '92c12fae9a977ea1dcb9f4de56257d4945101db7' into eclair-mr2-plus-aosp

* commit '92c12fae9a977ea1dcb9f4de56257d4945101db7':
  Fix Zygote -- don't depend on these classes that are no longer
2009-11-16 14:35:49 -08:00
Scott Main
63070f08a6 am 8faa61c3: am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit '8faa61c3304392a9ab02387b1adad49dc8a5e488' into eclair-mr2-plus-aosp

* commit '8faa61c3304392a9ab02387b1adad49dc8a5e488':
  docs: update the publishing guide to revise the updating section
2009-11-16 14:35:10 -08:00