Commit Graph

8566 Commits

Author SHA1 Message Date
Wink Saville
d776a26b8e am 2f9d8dbe: Merge change I749d6801 into eclair-mr2
Merge commit '2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979' into eclair-mr2-plus-aosp

* commit '2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979':
  Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
2009-12-02 16:16:17 -08:00
Jaikumar Ganesh
11ed4774c1 am 59c06278: (-s ours) Merge change I721361f1 into eclair
Merge commit '59c0627841381f47da5cc72e6ff55fa8bad431ed' into eclair-mr2

* commit '59c0627841381f47da5cc72e6ff55fa8bad431ed':
  Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 16:10:04 -08:00
Android (Google) Code Review
7db8f45d8b Merge change I721361f1 into eclair
* changes:
  Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 16:02:58 -08:00
Scott Main
aa01214bcb am 525bfe89: Merge change I9fb53a9c into eclair
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-mr2

* commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a':
  add screenshots for the Bluetooth Chat sample app
2009-12-02 15:49:56 -08:00
Android (Google) Code Review
574101140a Merge change I9fb53a9c into eclair
* changes:
  add screenshots for the Bluetooth Chat sample app
2009-12-02 15:40:17 -08:00
Eric Fischer
a73aa261dc am fbc18f9b: am 6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit 'fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da' into eclair-mr2-plus-aosp

* commit 'fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:20:54 -08:00
Android (Google) Code Review
1d9c8f8ff8 Merge change I749d6801 into eclair-mr2
* changes:
  Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set and minor fixes.
2009-12-02 15:16:58 -08:00
Eric Fischer
1cccb28efa am 6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2

* commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:11:36 -08:00
Android (Google) Code Review
75aa7bddc7 Merge change Id0704505 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-12-02 15:01:35 -08:00
Ken Shirriff
decfeed45c am dfac0e5e: Merge change I3fbd0a2f into eclair-mr2
Merge commit 'dfac0e5ece844c9052d54bfde6b2cc013a818beb' into eclair-mr2-plus-aosp

* commit 'dfac0e5ece844c9052d54bfde6b2cc013a818beb':
  Generate a calendar static Java library.
2009-12-02 13:10:13 -08:00
Android (Google) Code Review
1d9a37f92b Merge change I3fbd0a2f into eclair-mr2
* changes:
  Generate a calendar static Java library.
2009-12-02 13:02:36 -08:00
Leon Scroggins
3bb6b7fd3b am b5c7ef33: When passing the Message for saved form data, pass the node pointer properly.
Merge commit 'b5c7ef331cfca927c5b67bfe472eb7173a0ca69f' into eclair-mr2-plus-aosp

* commit 'b5c7ef331cfca927c5b67bfe472eb7173a0ca69f':
  When passing the Message for saved form data, pass the node pointer properly.
2009-12-02 12:46:32 -08:00
Grace Kloba
5efd3d6706 am 4eeace3d: Merge change I097b1e77 into eclair-mr2
Merge commit '4eeace3db541bd6fa0034a996630768cb521f2eb' into eclair-mr2-plus-aosp

* commit '4eeace3db541bd6fa0034a996630768cb521f2eb':
  Add PageCacheCapacity to the WebSettings.
2009-12-02 11:48:46 -08:00
Android (Google) Code Review
e2493811e4 Merge change I097b1e77 into eclair-mr2
* changes:
  Add PageCacheCapacity to the WebSettings.
2009-12-02 11:43:56 -08:00
Fred Quintana
6affcde639 am f307ec5d: Merge change Iafa92b8f into eclair-mr2
Merge commit 'f307ec5d82ce75112eb60118db89dbfee6819e90' into eclair-mr2-plus-aosp

* commit 'f307ec5d82ce75112eb60118db89dbfee6819e90':
  remove accounts for authenticators that are uninstalled
2009-12-02 11:38:29 -08:00
Mark Wagner
1e9c4866ce am ba1a0717: Merge change I6430912f into eclair-mr2
Merge commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642' into eclair-mr2-plus-aosp

* commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642':
  New constants for db upgrade.
2009-12-02 11:37:55 -08:00
Wink Saville
b1f1ae712f am 7d2fd650: am cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit '7d2fd6501595137e91ad042cd550decd2f8040fc' into eclair-mr2-plus-aosp

* commit '7d2fd6501595137e91ad042cd550decd2f8040fc':
  Cleanup @hide and @deprecated directives.
2009-12-02 11:34:26 -08:00
Android (Google) Code Review
9b2fe0d68a Merge change Iafa92b8f into eclair-mr2
* changes:
  remove accounts for authenticators that are uninstalled
2009-12-02 11:31:35 -08:00
Android (Google) Code Review
c3e5b02c09 Merge change I6430912f into eclair-mr2
* changes:
  New constants for db upgrade.
2009-12-02 11:30:34 -08:00
Wink Saville
89822e69cf am cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2

* commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7':
  Cleanup @hide and @deprecated directives.
2009-12-02 11:26:23 -08:00
Amith Yamasani
8d68ed983d am 42c4c589: am a9791d30: Merge change Iae3ed706 into eclair
Merge commit '42c4c589003c029309c823e8f06ed00b3cdb21de' into eclair-mr2-plus-aosp

* commit '42c4c589003c029309c823e8f06ed00b3cdb21de':
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 09:57:47 -08:00
Dirk Dougherty
781aad19ce am 233c50e4: am 43810507: Merge change Ic8231560 into eclair
Merge commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9' into eclair-mr2-plus-aosp

* commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9':
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-02 09:57:17 -08:00
Eric Laurent
28c7284fc8 am 6076046a: am 1ac56b60: Merge change Iac196e17 into eclair
Merge commit '6076046a11d2cd3733e4c7d108b3b26d167ae731' into eclair-mr2-plus-aosp

* commit '6076046a11d2cd3733e4c7d108b3b26d167ae731':
  Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
2009-12-02 09:56:44 -08:00
Mathias Agopian
4efcdf1334 am f764dae4: am 33ad0f9e: Merge change I0e44976a into eclair
Merge commit 'f764dae4a5f662660bea0657746622b6672b24a9' into eclair-mr2-plus-aosp

* commit 'f764dae4a5f662660bea0657746622b6672b24a9':
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-02 09:56:08 -08:00
Amith Yamasani
6ec4f46210 am a9791d30: Merge change Iae3ed706 into eclair
Merge commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2

* commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc':
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 09:50:40 -08:00
Dirk Dougherty
4561dad711 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
b598e9f38d 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
ca8fa5a7bf 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
7b1451d360 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
29933296ed 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
Dianne Hackborn
03df18e2c5 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
c9cb35a65a 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
da5b289de2 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
99d4d53cda 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
88c9b881ec 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
3e22f3c866 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
29525ec532 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
abb64629e2 Merge change I5ff64f6f into eclair-mr2
* changes:
  Add CameraServiceTest.
2009-12-02 02:48:40 -08:00
Android (Google) Code Review
63c33bc9c1 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
9e50912d68 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
Romain Guy
15587bc085 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
Scott Main
b8761236fd 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
a0077d926d 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
9e2dcb75f6 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
0c185761c9 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
69fec4726b 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
b0f41b767e 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
525f49570b 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
e3a722cf68 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
39b2dcd126 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