Commit Graph

15384 Commits

Author SHA1 Message Date
Omari Stephens
af08835a95 am 15620b1e: am 21eb1738: am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '15620b1eef1ab1f42c7fbcbfce1f54e0c205df1b'

* commit '15620b1eef1ab1f42c7fbcbfce1f54e0c205df1b':
  Revive backup tests
2009-12-02 20:49:14 -08:00
Guang Zhu
6c03325573 am 26fd3840: am 7dd3337b: Merge change I8179742a into eclair-mr2
Merge commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5'

* commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5':
  Add support for extracting render time and image in page cycler
2009-12-02 20:48:40 -08:00
Takaoka G. Tadashi
cc60238165 am 94985152: am d5b325aa: Add WSP header to WAP_PUSH_RECEIVED intent in addition to data Import CL 146651 from //branches/cupcake_dcm
Merge commit '949851525a1aebca0d7d6b9a3465d5e572c8c621'

* commit '949851525a1aebca0d7d6b9a3465d5e572c8c621':
  Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
2009-12-02 20:48:07 -08:00
Takaoka G. Tadashi
bdb9b3042a am 5d2a7b26: am 7d51517c: Merge change I611c15cf into eclair-mr2
Merge commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef'

* commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef':
  Add DoCoMo vendor specific OMNA WSP content type number
2009-12-02 20:47:32 -08:00
Dmitri Plotnikov
658915aeec am 375b8016: am bbdba641: Merge change Icae1a990 into eclair-mr2
Merge commit '375b80162f58d93d8aef055a1ca1d42964132708'

* commit '375b80162f58d93d8aef055a1ca1d42964132708':
  Adding NAME_RAW_CONTACT_ID column to Contacts.
2009-12-02 20:46:57 -08:00
Mathias Agopian
a65168a0d3 am 2aa10791: am 96dac84b: am 121a31ac: Merge change Id86beb99 into eclair
Merge commit '2aa107917b5a7e6de720a34c4701de55ee9772eb'

* commit '2aa107917b5a7e6de720a34c4701de55ee9772eb':
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 20:46:21 -08:00
Mike Lockwood
af942bf8b3 am cd753d16: am f72fb68b: resolved conflicts for merge of 9b7dba93 to eclair-mr2
Merge commit 'cd753d168f9d62b6e852c5ab0f61436619085e6f'

* commit 'cd753d168f9d62b6e852c5ab0f61436619085e6f':
  Implement new notification LED blinking logic:
2009-12-02 20:45:24 -08:00
Dianne Hackborn
9fae90637a am a0c9c173: am 2d8b0c3f: am 8693f82d: Merge change If1f0bf33 into eclair
Merge commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f'

* commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f':
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 20:44:34 -08:00
Jaikumar Ganesh
e347a9f9b5 am fafa98e5: (-s ours) am f45bf8fa: am 59c06278: (-s ours) Merge change I721361f1 into eclair
Merge commit 'fafa98e51bea0fd9c0f48fe31d54b663db18fe86'

* commit 'fafa98e51bea0fd9c0f48fe31d54b663db18fe86':
  Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 20:43:49 -08:00
Scott Main
5c83bfaf11 am da5a110b: am 7863eb11: am 525bfe89: Merge change I9fb53a9c into eclair
Merge commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5'

* commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5':
  add screenshots for the Bluetooth Chat sample app
2009-12-02 20:42:54 -08:00
Wink Saville
16fbdbfb01 am a7493240: am 2f9d8dbe: Merge change I749d6801 into eclair-mr2
Merge commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af'

* commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af':
  Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
2009-12-02 20:42:09 -08:00
Eric Fischer
0e3887a2e5 am fecb27b3: (-s ours) am fbc18f9b: am 6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit 'fecb27b3aada89dd5cc5f82e8bb55aa79e2a3835'

* commit 'fecb27b3aada89dd5cc5f82e8bb55aa79e2a3835':
  Import revised translations.  DO NOT MERGE
2009-12-02 20:40:37 -08:00
Ken Shirriff
93a74dc6b5 am 027672c1: am dfac0e5e: Merge change I3fbd0a2f into eclair-mr2
Merge commit '027672c16890011b212ea5ff3b14966a1e07d651'

* commit '027672c16890011b212ea5ff3b14966a1e07d651':
  Generate a calendar static Java library.
2009-12-02 20:37:40 -08:00
Leon Scroggins
8d91bd1760 am b2c13d7c: am b5c7ef33: When passing the Message for saved form data, pass the node pointer properly.
Merge commit 'b2c13d7c8e616d5680260e128b2c31021a160add'

* commit 'b2c13d7c8e616d5680260e128b2c31021a160add':
  When passing the Message for saved form data, pass the node pointer properly.
2009-12-02 20:36:36 -08:00
Grace Kloba
61ddf204da am 2216636d: am 4eeace3d: Merge change I097b1e77 into eclair-mr2
Merge commit '2216636d6b6ba33d52f0b6f6086d22d75c915b02'

* commit '2216636d6b6ba33d52f0b6f6086d22d75c915b02':
  Add PageCacheCapacity to the WebSettings.
2009-12-02 20:34:56 -08:00
Fred Quintana
0b957851c5 am 74f7b139: am f307ec5d: Merge change Iafa92b8f into eclair-mr2
Merge commit '74f7b139d0e380969268f44d5358db08e0325394'

* commit '74f7b139d0e380969268f44d5358db08e0325394':
  remove accounts for authenticators that are uninstalled
2009-12-02 20:33:59 -08:00
Mark Wagner
a5883d6aca am 3790933a: am ba1a0717: Merge change I6430912f into eclair-mr2
Merge commit '3790933aa33e5f1d411b1ed7b31210abff5a5b15'

* commit '3790933aa33e5f1d411b1ed7b31210abff5a5b15':
  New constants for db upgrade.
2009-12-02 20:33:21 -08:00
Wink Saville
03fe67da5a am ea200b0c: am 7d2fd650: am cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit 'ea200b0c6f92ebdd116b088cf895b4aa82fe8c2e'

* commit 'ea200b0c6f92ebdd116b088cf895b4aa82fe8c2e':
  Cleanup @hide and @deprecated directives.
2009-12-02 20:32:26 -08:00
Amith Yamasani
9ce13a3993 am 1224b101: am 42c4c589: am a9791d30: Merge change Iae3ed706 into eclair
Merge commit '1224b1016d2a4ec172f13741e632e59c7528b319'

* commit '1224b1016d2a4ec172f13741e632e59c7528b319':
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 20:29:40 -08:00
Dirk Dougherty
0f29956e43 am fe4e74b6: am 233c50e4: am 43810507: Merge change Ic8231560 into eclair
Merge commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72'

* commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72':
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-02 20:28:55 -08:00
Eric Laurent
2f065852d6 am 52d390e8: am 6076046a: am 1ac56b60: Merge change Iac196e17 into eclair
Merge commit '52d390e8892967c1fad717a00731c0a25e268686'

* commit '52d390e8892967c1fad717a00731c0a25e268686':
  Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
2009-12-02 20:28:16 -08:00
Mathias Agopian
67fd40f51b am 44dcf411: am f764dae4: am 33ad0f9e: Merge change I0e44976a into eclair
Merge commit '44dcf411b01bdbd0ae2aeef3e958403a1096f36b'

* commit '44dcf411b01bdbd0ae2aeef3e958403a1096f36b':
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-02 20:27:37 -08:00
Leon Scroggins
736f0092ff am 1e8c9625: am cfc2915d: In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit '1e8c96251ca885db700978a3566a67af27099b02'

* commit '1e8c96251ca885db700978a3566a67af27099b02':
  In setDefaultSelection ensure that webkit is notified of the new selection.
2009-12-02 20:25:53 -08:00
Dianne Hackborn
8a1b6decfb am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair
Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e'

* commit 'e2585127974ce972a013407e2af95d8776a99a8e':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 20:24:44 -08:00
Ray Chen
9495f8a154 am cb6203cd: am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4'

* commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 20:23:48 -08:00
Leon Scroggins
8194935a91 am f12a5c9b: (-s ours) am ad7ab8be: am db08d5cd: (-s ours) DO NOT MERGE.
Merge commit 'f12a5c9b12aaa5a45cd8c4b7f77a6eefdf4a85d8'

* commit 'f12a5c9b12aaa5a45cd8c4b7f77a6eefdf4a85d8':
  DO NOT MERGE.
2009-12-02 20:22:55 -08:00
Chih-Chung Chang
edc5d327ce am c7763aca: am 54f32f56: Merge change I5ff64f6f into eclair-mr2
Merge commit 'c7763acabb530950f9af0f487d4834d2ee26ec69'

* commit 'c7763acabb530950f9af0f487d4834d2ee26ec69':
  Add CameraServiceTest.
2009-12-02 20:19:58 -08:00
Omari Stephens
15620b1eef am 21eb1738: am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp

* commit '21eb173864670c2f759258016d95f0bcd06313e7':
  Revive backup tests
2009-12-02 18:32:51 -08:00
Omari Stephens
21eb173864 am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2

* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
  Revive backup tests
2009-12-02 18:26:05 -08:00
Android (Google) Code Review
7dfecb86db Merge change Iaa6e73a6 into eclair
* changes:
  Revive backup tests
2009-12-02 18:21:49 -08:00
Guang Zhu
26fd384011 am 7dd3337b: Merge change I8179742a into eclair-mr2
Merge commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab' into eclair-mr2-plus-aosp

* commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab':
  Add support for extracting render time and image in page cycler
2009-12-02 18:11:34 -08:00
Takaoka G. Tadashi
949851525a am d5b325aa: Add WSP header to WAP_PUSH_RECEIVED intent in addition to data Import CL 146651 from //branches/cupcake_dcm
Merge commit 'd5b325aaaca7e5197851d26332f48b917d961b9d' into eclair-mr2-plus-aosp

* commit 'd5b325aaaca7e5197851d26332f48b917d961b9d':
  Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
2009-12-02 18:11:04 -08:00
Takaoka G. Tadashi
5d2a7b26d6 am 7d51517c: Merge change I611c15cf into eclair-mr2
Merge commit '7d51517cec75cbccd1ac53ac6ca7dd506af4637e' into eclair-mr2-plus-aosp

* commit '7d51517cec75cbccd1ac53ac6ca7dd506af4637e':
  Add DoCoMo vendor specific OMNA WSP content type number
2009-12-02 18:10:34 -08:00
Dmitri Plotnikov
375b80162f am bbdba641: Merge change Icae1a990 into eclair-mr2
Merge commit 'bbdba6414ff4adccad2a56195c8c144f7e3a025a' into eclair-mr2-plus-aosp

* commit 'bbdba6414ff4adccad2a56195c8c144f7e3a025a':
  Adding NAME_RAW_CONTACT_ID column to Contacts.
2009-12-02 18:09:59 -08:00
Mathias Agopian
2aa107917b am 96dac84b: am 121a31ac: Merge change Id86beb99 into eclair
Merge commit '96dac84be4143d83b13648045b9af31ac0f81004' into eclair-mr2-plus-aosp

* commit '96dac84be4143d83b13648045b9af31ac0f81004':
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 18:09:22 -08:00
Android (Google) Code Review
7dd3337b8e Merge change I8179742a into eclair-mr2
* changes:
  Add support for extracting render time and image in page cycler
2009-12-02 18:04:23 -08:00
Takaoka G. Tadashi
d5b325aaac Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Import CL 146651 from //branches/cupcake_dcm
2009-12-03 11:01:59 +09:00
Android (Google) Code Review
7d51517cec Merge change I611c15cf into eclair-mr2
* changes:
  Add DoCoMo vendor specific OMNA WSP content type number     Import CL 145261 from //branches/cupcake_dcm
2009-12-02 17:56:20 -08:00
Android (Google) Code Review
bbdba6414f Merge change Icae1a990 into eclair-mr2
* changes:
  Adding NAME_RAW_CONTACT_ID column to Contacts.
2009-12-02 17:55:39 -08:00
Guang Zhu
5dc4f21ab6 Add support for extracting render time and image in page cycler 2009-12-02 17:55:18 -08:00
Mike Lockwood
cd753d168f am f72fb68b: resolved conflicts for merge of 9b7dba93 to eclair-mr2
Merge commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp

* commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9':
  Implement new notification LED blinking logic:
2009-12-02 17:51:09 -08:00
Mathias Agopian
96dac84be4 am 121a31ac: Merge change Id86beb99 into eclair
Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2

* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:50:45 -08:00
Omari Stephens
aa6e73a6c8 Revive backup tests 2009-12-02 17:39:27 -08:00
Android (Google) Code Review
121a31ac39 Merge change Id86beb99 into eclair
* changes:
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:09:46 -08:00
Mike Lockwood
f72fb68bf3 resolved conflicts for merge of 9b7dba93 to eclair-mr2
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
2009-12-02 19:57:33 -05:00
Dianne Hackborn
a0c9c173f1 am 2d8b0c3f: am 8693f82d: Merge change If1f0bf33 into eclair
Merge commit '2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0' into eclair-mr2-plus-aosp

* commit '2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0':
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 16:29:54 -08:00
Android (Google) Code Review
9b7dba936c Merge change Icc49422a into eclair
* changes:
  Implement new notification LED blinking logic:
2009-12-02 16:24:15 -08:00
Dianne Hackborn
2d8b0c3f0f am 8693f82d: Merge change If1f0bf33 into eclair
Merge commit '8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-mr2

* commit '8693f82d02fd9b3a805e076fa1eafacd1737446d':
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 16:23:45 -08:00
Mathias Agopian
d86beb99a7 fix [2291418] Camera preview cannot work in Emulator
The image buffer used by glTexImage2d() would be uninitialized when no copybit engine
can be found.
We now always initialize images, since the abscence of copybit is not necessarily fatal.
2009-12-02 16:23:11 -08:00
Android (Google) Code Review
8693f82d02 Merge change If1f0bf33 into eclair
* changes:
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 16:17:54 -08:00