13337 Commits

Author SHA1 Message Date
Dirk Dougherty
233c50e4aa am 43810507: Merge change Ic8231560 into eclair
Merge commit '43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-mr2

* commit '43810507b75cd492e8177ee082e688f87f0ab49c':
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-02 09:49:21 -08:00
Eric Laurent
6076046a11 am 1ac56b60: Merge change Iac196e17 into eclair
Merge commit '1ac56b602aa6a1ac54c608e5a8b76f44638db23b' into eclair-mr2

* commit '1ac56b602aa6a1ac54c608e5a8b76f44638db23b':
  Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
2009-12-02 09:48:52 -08:00
Mathias Agopian
f764dae4a5 am 33ad0f9e: Merge change I0e44976a into eclair
Merge commit '33ad0f9ec8d47660b16ced45242a45f369fe2547' into eclair-mr2

* commit '33ad0f9ec8d47660b16ced45242a45f369fe2547':
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-02 09:47:48 -08:00
Android (Google) Code Review
a9791d304b Merge change Iae3ed706 into eclair
* changes:
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 08:35:55 -08:00
Leon Scroggins
1e8c96251c am cfc2915d: In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit 'cfc2915d926cee14380b54d0960262e748eed4f5' into eclair-mr2-plus-aosp

* commit 'cfc2915d926cee14380b54d0960262e748eed4f5':
  In setDefaultSelection ensure that webkit is notified of the new selection.
2009-12-02 07:42:26 -08:00
Leon Scroggins
cfc2915d92 In setDefaultSelection ensure that webkit is notified of the new selection.
Fix for http://b/issue?id=2254732
2009-12-02 10:27:22 -05:00
Dianne Hackborn
e258512797 am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '9ed7dc10d263a505da32522139098f085fee811a' into eclair-mr2-plus-aosp

* commit '9ed7dc10d263a505da32522139098f085fee811a':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 05:35:46 -08:00
Ray Chen
cb6203cdcb am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp

* commit '9db1a37cc48a01a66ee8026de303faaf4a83667d':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 05:35:12 -08:00
Leon Scroggins
f12a5c9b12 am ad7ab8be: am db08d5cd: (-s ours) DO NOT MERGE.
Merge commit 'ad7ab8be4774a4fbb01a50deed52e819549327a7' into eclair-mr2-plus-aosp

* commit 'ad7ab8be4774a4fbb01a50deed52e819549327a7':
  DO NOT MERGE.
2009-12-02 05:34:39 -08:00
Dianne Hackborn
9ed7dc10d2 am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-mr2

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 05:26:12 -08:00
Ray Chen
9db1a37cc4 am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 05:25:43 -08:00
Leon Scroggins
ad7ab8be47 am db08d5cd: (-s ours) DO NOT MERGE.
Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2

* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
  DO NOT MERGE.
2009-12-02 05:25:12 -08:00
Chih-Chung Chang
c7763acabb am 54f32f56: Merge change I5ff64f6f into eclair-mr2
Merge commit '54f32f562b455ddea84ad9b95946a98e6dfb6686' into eclair-mr2-plus-aosp

* commit '54f32f562b455ddea84ad9b95946a98e6dfb6686':
  Add CameraServiceTest.
2009-12-02 02:54:53 -08:00
Android (Google) Code Review
54f32f562b Merge change I5ff64f6f into eclair-mr2
* changes:
  Add CameraServiceTest.
2009-12-02 02:48:40 -08:00
Android (Google) Code Review
43810507b7 Merge change Ic8231560 into eclair
* changes:
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-01 22:41:22 -08:00
Android (Google) Code Review
1ac56b602a Merge change Iac196e17 into eclair
* changes:
  Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
2009-12-01 22:39:33 -08:00
Takaoka G. Tadashi
611c15cfc6 Add DoCoMo vendor specific OMNA WSP content type number
Import CL 145261 from //branches/cupcake_dcm

See http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.aspx
2009-12-02 14:45:29 +09:00
Dirk Dougherty
7500f341dd sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Bug: 2160782
Change-Id: Ic8231560ef1bc036cfd5d242c65f654cb110fc6b
2009-12-01 19:27:26 -08:00
Romain Guy
e8b002ba63 am f7b4accb: Fix scroll jump in ScrollView.
Merge commit 'f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9' into eclair-mr2-plus-aosp

* commit 'f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9':
  Fix scroll jump in ScrollView.
2009-12-01 19:05:57 -08:00
Amith Yamasani
ae3ed70670 Add new setting for notification light pulsing. Bug #2238250
New System setting and code to set the defaults on upgrade.
2009-12-01 19:02:05 -08:00
Romain Guy
f7b4accbda Fix scroll jump in ScrollView.
If a touch event was targeted at a ScrollView child, the content would jump after
the user moved her finger by the required threshold. This is inconsistent with
ListView's behavior.

Fixes #2296622.
2009-12-01 18:58:46 -08:00
Scott Main
1109703c59 am 03828c0e: am 0bd1eeaf: Merge change I21a67b8d into eclair
Merge commit '03828c0e675ea2cfb2141dd56d9b2bebc2570646' into eclair-mr2-plus-aosp

* commit '03828c0e675ea2cfb2141dd56d9b2bebc2570646':
  docs: remove droid-specific behavior change from platform notes
2009-12-01 18:44:02 -08:00
Jaikumar Ganesh
88432fc6c4 am 9cf7f7cf: am a80a75f3: (-s ours) Merge change I5f24a240 into eclair
Merge commit '9cf7f7cfc5b75fbea8d65999fcf86b6d9a7ad044' into eclair-mr2-plus-aosp

* commit '9cf7f7cfc5b75fbea8d65999fcf86b6d9a7ad044':
  Register Handsfree profile before headset profile. DO NOT MERGE.
2009-12-01 18:43:32 -08:00
Mike Lockwood
8fcb312f6c am c1bb46e9: am abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2' into eclair-mr2-plus-aosp

* commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-12-01 18:42:55 -08:00
Bai Tao
57928702bf am a8c79a8c: am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit 'a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b' into eclair-mr2-plus-aosp

* commit 'a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b':
  Sending UCS2 encoded SMS correctly
2009-12-01 18:42:13 -08:00
Mathias Agopian
7671c088cd am 77f17095: am 533a2803: Merge change I18ffb549 into eclair
Merge commit '77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2' into eclair-mr2-plus-aosp

* commit '77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-12-01 18:41:42 -08:00
Mathias Agopian
a628e02385 am 102f4dbb: am 8e4a110b: Merge change I5469a4ac into eclair
Merge commit '102f4dbb2396e779c588862cfb748ebfc333340d' into eclair-mr2-plus-aosp

* commit '102f4dbb2396e779c588862cfb748ebfc333340d':
  fixed [2260070] display stopped updating
2009-12-01 18:41:01 -08:00
Eric Fischer
7a6a867f9e am c711e06c: am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit 'c711e06c1869b1e5be5b7a9826470564268328ac' into eclair-mr2-plus-aosp

* commit 'c711e06c1869b1e5be5b7a9826470564268328ac':
  Import revised translations.  DO NOT MERGE
2009-12-01 18:40:07 -08:00
Eric Laurent
e77d408345 am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp

* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 18:39:17 -08:00
Scott Main
03828c0e67 am 0bd1eeaf: Merge change I21a67b8d into eclair
Merge commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74' into eclair-mr2

* commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74':
  docs: remove droid-specific behavior change from platform notes
2009-12-01 18:31:19 -08:00
Jaikumar Ganesh
9cf7f7cfc5 am a80a75f3: (-s ours) Merge change I5f24a240 into eclair
Merge commit 'a80a75f34a98fe1e41afab93c97aca505939903a' into eclair-mr2

* commit 'a80a75f34a98fe1e41afab93c97aca505939903a':
  Register Handsfree profile before headset profile. DO NOT MERGE.
2009-12-01 18:30:45 -08:00
Mike Lockwood
c1bb46e9d5 am abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2

* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-12-01 18:30:12 -08:00
Android (Google) Code Review
33ad0f9ec8 Merge change I0e44976a into eclair
* changes:
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-01 18:01:25 -08:00
Ken Shirriff
188a70e957 Generate a calendar static Java library.
This contains the calendar contract and pim functions for use by the
sync adapter.  This library is a duplicate of the functions in the
framework.
2009-12-01 17:42:41 -08:00
Mathias Agopian
0e44976aa4 fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
There was bug in the logic that calculated the relative timeout, the start time was
reset each time an event was received, which caused the timeout to never occur if
an application was constantly redrawing.

Now we always check for a timeout when we come back from the waitEvent() and
process the "anti-freeze" if needed, regardless of whether an event was received.
2009-12-01 17:23:28 -08:00
Bai Tao
a8c79a8c65 am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2

* commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
  Sending UCS2 encoded SMS correctly
2009-12-01 17:16:50 -08:00
Mathias Agopian
77f17095ed am 533a2803: Merge change I18ffb549 into eclair
Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-mr2

* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-12-01 17:13:50 -08:00
Romain Guy
9e2d2e746b am cf98f426: Merge change I325e22ca into eclair-mr2
Merge commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8' into eclair-mr2-plus-aosp

* commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8':
  Fix a leak in WebView.
2009-12-01 17:11:38 -08:00
Andreas Huber
ae34cf92db am 781ac162: Merge change I8768f2cc into eclair-mr2
Merge commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp

* commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
  A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
2009-12-01 17:10:19 -08:00
Mathias Agopian
102f4dbb23 am 8e4a110b: Merge change I5469a4ac into eclair
Merge commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f' into eclair-mr2

* commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f':
  fixed [2260070] display stopped updating
2009-12-01 17:10:08 -08:00
Vasu Nori
3414c67afa am 1533aed6: Merge change Ib1dd3235 into eclair-mr2
Merge commit '1533aed6d90b776c815bae819d1413064aa1f0d9' into eclair-mr2-plus-aosp

* commit '1533aed6d90b776c815bae819d1413064aa1f0d9':
  fix NPE. don't release an already released compiledSql obj
2009-12-01 17:08:38 -08:00
Eric Fischer
c711e06c18 am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit '926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-mr2

* commit '926492d9cc51f28f0471352cde77d2d91ae9becd':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:08:16 -08:00
Jaikumar Ganesh
4b9e9c37d5 am 03cb1f15: Merge change I249345ee into eclair-mr2
Merge commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d' into eclair-mr2-plus-aosp

* commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d':
  Add AUTO_CONNECT priority for Headset profile.
2009-12-01 17:06:59 -08:00
Derek Sollenberger
079324bf5b am 732a1223: Merge change I42d00fbe into eclair-mr2
Merge commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c' into eclair-mr2-plus-aosp

* commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c':
  fix issue with plugin surfaces not updating properly within the view system.
2009-12-01 17:05:18 -08:00
Eric Laurent
5e392e2b02 am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 17:04:24 -08:00
Android (Google) Code Review
cf98f4268c Merge change I325e22ca into eclair-mr2
* changes:
  Fix a leak in WebView.
2009-12-01 16:40:07 -08:00
Romain Guy
01d0fbfa68 Fix a leak in WebView.
Fixes #2296601.

WebView and its related APIs are keeping static objects that hold references to
Context instance. This could cause applications to leak their first Activity
and all the associated resources.
2009-12-01 16:37:59 -08:00
Android (Google) Code Review
5886050fad Merge change I0d8f7593 into eclair
* changes:
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 15:57:50 -08:00
Android (Google) Code Review
781ac16283 Merge change I8768f2cc into eclair-mr2
* changes:
  A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
2009-12-01 15:42:34 -08:00
Andreas Huber
8768f2ccef A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s). 2009-12-01 15:26:54 -08:00