Commit Graph

10660 Commits

Author SHA1 Message Date
Dianne Hackborn
ec8ad5915e 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
cc28fd2577 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
1cb125bc8b 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
7e151d2698 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
9647a34100 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
9296cc668b 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
7fda579d30 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
56b1af745b 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
be0dcb0db4 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
5023315ef5 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
aeb3c5a007 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
5e6b89992a 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
47c778ee49 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
0dd59f0022 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
d7a84af4c9 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
1760d2eba9 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
497386c91a 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
4d8a0c967a 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
9c81b4c713 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
c5ea9a8bd0 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
Dianne Hackborn
a0a1e92cac 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
Dianne Hackborn
44fe74c901 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
Android (Google) Code Review
4fb7951251 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
Jaikumar Ganesh
354ed78018 am f45bf8fa: am 59c06278: (-s ours) Merge change I721361f1 into eclair
Merge commit 'f45bf8fa4056fc800cc181b7031bd886e97aa1d5' into eclair-mr2-plus-aosp

* commit 'f45bf8fa4056fc800cc181b7031bd886e97aa1d5':
  Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 16:17:15 -08:00
Scott Main
d843639588 am 7863eb11: am 525bfe89: Merge change I9fb53a9c into eclair
Merge commit '7863eb11265cd06ee35a670b5e994d65e31337c3' into eclair-mr2-plus-aosp

* commit '7863eb11265cd06ee35a670b5e994d65e31337c3':
  add screenshots for the Bluetooth Chat sample app
2009-12-02 16:16:45 -08:00
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