Commit Graph

11211 Commits

Author SHA1 Message Date
Scott Main
cc9d066bf3 am 5c24774d: am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk
Merge commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a' into eclair-mr2-plus-aosp

* commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a':
  docs: fix broken link for download page.
2009-10-29 01:45:40 -07:00
Ying Wang
69e73d01e5 am 102767cd: am d85c4b34: Merge change Idb328ab7 into eclair
Merge commit '102767cd3be39fd3865be02421fd1763f3ff33d5' into eclair-mr2-plus-aosp

* commit '102767cd3be39fd3865be02421fd1763f3ff33d5':
  Explicitly specify that online-sdk depends on framework-res.
2009-10-29 01:45:23 -07:00
Guang Zhu
dfc54a4412 am 0b12dc3a: am aebcaec3: Merge change I2e90d640 into eclair
Merge commit '0b12dc3acaa5e6b2b0ac05374faf65a7e212ae4f' into eclair-mr2-plus-aosp

* commit '0b12dc3acaa5e6b2b0ac05374faf65a7e212ae4f':
  Remove the activity restart between urls.
2009-10-29 01:45:05 -07:00
Jason Sams
3c249da7ea am 21e799ed: am e9e50b57: Merge change I7136220b into eclair
Merge commit '21e799ed62d4fca56fc472acef2995fa2235c0c1' into eclair-mr2-plus-aosp

* commit '21e799ed62d4fca56fc472acef2995fa2235c0c1':
  Fix egl cleanup code on context teardown.
2009-10-29 01:44:47 -07:00
Mike Lockwood
4f049475c7 am f634f492: am 5ef89808: Merge change I9c242127 into eclair
Merge commit 'f634f4922894cc23a9b2298a0c971ffac763c132' into eclair-mr2-plus-aosp

* commit 'f634f4922894cc23a9b2298a0c971ffac763c132':
  PowerManagerService: Animate LCD backlight changes due to autobrightness support.
2009-10-29 01:44:29 -07:00
Dave Sparks
a628d54d10 am 63733498: am 98de26e0: Merge change I8cc42c52 into eclair
Merge commit '6373349836237abffc3de8a3632234170bc1cfca' into eclair-mr2-plus-aosp

* commit '6373349836237abffc3de8a3632234170bc1cfca':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
2009-10-29 01:44:11 -07:00
Mike Reed
9a6cf15048 am a01dc0fc: am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair
Merge commit 'a01dc0fc59fb7a7c4fd33533ec47069268b70863' into eclair-mr2-plus-aosp

* commit 'a01dc0fc59fb7a7c4fd33533ec47069268b70863':
  do not merge
2009-10-29 01:43:53 -07:00
Dianne Hackborn
9a27909e75 am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '40946aa20183984fd60f2dbdc7708cf1c5431047' into eclair-mr2-plus-aosp

* commit '40946aa20183984fd60f2dbdc7708cf1c5431047':
  Add SDK version for MR1.
2009-10-29 01:43:33 -07:00
Scott Main
5c24774de4 am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk
Merge commit '4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-mr2

* commit '4252244939089ce0b055456335071bb7f2c0d1c3':
  docs: fix broken link for download page.
2009-10-29 01:24:47 -07:00
Ying Wang
102767cd3b am d85c4b34: Merge change Idb328ab7 into eclair
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2

* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
  Explicitly specify that online-sdk depends on framework-res.
2009-10-29 01:23:58 -07:00
Guang Zhu
0b12dc3aca am aebcaec3: Merge change I2e90d640 into eclair
Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-mr2

* commit 'aebcaec3c171f636a24051ce85ded2f86b09461b':
  Remove the activity restart between urls.
2009-10-29 01:23:33 -07:00
Jason Sams
21e799ed62 am e9e50b57: Merge change I7136220b into eclair
Merge commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8' into eclair-mr2

* commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8':
  Fix egl cleanup code on context teardown.
2009-10-29 01:22:47 -07:00
Mike Lockwood
f634f49228 am 5ef89808: Merge change I9c242127 into eclair
Merge commit '5ef898080c1b8b596531c938eae87b3c35331ac2' into eclair-mr2

* commit '5ef898080c1b8b596531c938eae87b3c35331ac2':
  PowerManagerService: Animate LCD backlight changes due to autobrightness support.
2009-10-29 01:21:46 -07:00
Dave Sparks
6373349836 am 98de26e0: Merge change I8cc42c52 into eclair
Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2

* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
2009-10-29 01:21:17 -07:00
Mike Reed
a01dc0fc59 am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair
Merge commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80' into eclair-mr2

* commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80':
  do not merge
2009-10-29 01:20:26 -07:00
Dianne Hackborn
40946aa201 am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2

* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
  Add SDK version for MR1.
2009-10-29 01:20:01 -07:00
Daisuke Miyakawa
d7185d0bd2 am f5633bc7: Fix test breakage in testNickNameV21().
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp

* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
  Fix test breakage in testNickNameV21().
2009-10-28 23:33:21 -07:00
Daisuke Miyakawa
3372855754 am d95a02c2: Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54' into eclair-mr2-plus-aosp

* commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54':
  Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
2009-10-28 23:33:07 -07:00
Daisuke Miyakawa
aa06a0e086 am 3c828e24: Merge change I9195a354 into eclair-mr2
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp

* commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0':
  Add partial support of Android-specific properties.
2009-10-28 23:32:41 -07:00
Dan Egnor
473bbd2140 am 95240270: Instead of a raw AIDL interface, give DropBox a Java interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the usual getSyste
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp

* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
  Instead of a raw AIDL interface, give DropBox a Java
2009-10-28 23:32:21 -07:00
Daisuke Miyakawa
f5633bc7e2 Fix test breakage in testNickNameV21().
Internal issue number: 2079082
2009-10-29 12:24:26 +09:00
Daisuke Miyakawa
d95a02c2a6 Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag.

Internal Issue number: 2217362
2009-10-29 11:01:07 +09:00
Android (Google) Code Review
3c828e24a9 Merge change I9195a354 into eclair-mr2
* changes:
  Add partial support of Android-specific properties.
2009-10-28 21:54:29 -04:00
Daisuke Miyakawa
837cba33c5 Add partial support of Android-specific properties.
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.

Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;

All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.

Internal Issue number: 2079082
2009-10-29 09:16:31 +09:00
Dan Egnor
952402704a Instead of a raw AIDL interface, give DropBox a Java
interface (android.os.DropBox); move the Binder interface
behind the scenes.  Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
2009-10-28 15:49:11 -07:00
Jean-Baptiste Queru
c4514c0912 merge from open-source master 2009-10-28 14:52:33 -07:00
Mike Reed
b26ab46355 am 10d32a33: Merge change I16dc1411 into eclair-mr2
Merge commit '10d32a338d5400786e784a0d6f51b53acea76b44' into eclair-mr2-plus-aosp

* commit '10d32a338d5400786e784a0d6f51b53acea76b44':
  add boundary patch
2009-10-28 12:46:55 -07:00
Amith Yamasani
9acffe7639 am 26d4e539: am 678cdbe5: Fix build.
Merge commit '26d4e539676346236082ed1d3eccdf078980b7d5' into eclair-mr2-plus-aosp

* commit '26d4e539676346236082ed1d3eccdf078980b7d5':
  Fix build.
2009-10-28 12:46:41 -07:00
Amith Yamasani
ef20445432 am 4ac5066d: am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d' into eclair-mr2-plus-aosp

* commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d':
  Disambiguation between multiple pointers and swipe gestures.
2009-10-28 12:46:26 -07:00
Wink Saville
e6028e52c9 am 02d89898: am a2058e43: Merge change I11c3cdc7 into eclair
Merge commit '02d89898c9b48426d5add48868a640c198a3321f' into eclair-mr2-plus-aosp

* commit '02d89898c9b48426d5add48868a640c198a3321f':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-28 12:46:11 -07:00
Mike Lockwood
80b6367dc6 am 8d1eeb21: am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '8d1eeb2144945365cae281552bd7bc5eb14f7688' into eclair-mr2-plus-aosp

* commit '8d1eeb2144945365cae281552bd7bc5eb14f7688':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
2009-10-28 12:45:54 -07:00
Mike Lockwood
e1da9d3583 am 7c64d448: am 8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '7c64d4486ad8704f0b63474e2da0dd89147771ad' into eclair-mr2-plus-aosp

* commit '7c64d4486ad8704f0b63474e2da0dd89147771ad':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-28 12:45:38 -07:00
Dirk Dougherty
a292fefeb7 am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '4c071f0d69ac0e3eaf386797faeb52d63de30806' into eclair-mr2-plus-aosp

* commit '4c071f0d69ac0e3eaf386797faeb52d63de30806':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 12:45:22 -07:00
Scott Main
aaeafec5cd am 66e69251: am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '66e6925154a64d4fab53e6241e9e1fd227f42352' into eclair-mr2-plus-aosp

* commit '66e6925154a64d4fab53e6241e9e1fd227f42352':
  docs: add 2.0 highlights doc and updated homepage
2009-10-28 12:45:03 -07:00
Dirk Dougherty
838bb98931 am 53976509: am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '53976509639b136150a844ff92544f96cf048943' into eclair-mr2-plus-aosp

* commit '53976509639b136150a844ff92544f96cf048943':
  doc change: fix broken link at top of installing doc
2009-10-28 12:44:46 -07:00
Yu Shan Emily Lau
f97dec837c am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp

* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 12:44:28 -07:00
Dave Sparks
687545fc9e am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp

* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 12:44:10 -07:00
Brett Chabot
32be57d100 am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair
Merge commit '622b190c878e38468096ef0fe1cd28dbc10c3b33' into eclair-mr2-plus-aosp

* commit '622b190c878e38468096ef0fe1cd28dbc10c3b33':
  Disable flaky and failing tests.
2009-10-28 12:43:52 -07:00
Andreas Huber
7373755ac3 am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp

* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 12:43:31 -07:00
Android (Google) Code Review
10d32a338d Merge change I16dc1411 into eclair-mr2
* changes:
  add boundary patch
2009-10-28 15:37:34 -04:00
Mike Reed
c04851fd0a add boundary patch 2009-10-28 15:18:41 -04:00
Amith Yamasani
26d4e53967 am 678cdbe5: Fix build.
Merge commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937' into eclair-mr2

* commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937':
  Fix build.
2009-10-28 11:42:56 -07:00
Amith Yamasani
4ac5066d53 am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2

* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
  Disambiguation between multiple pointers and swipe gestures.
2009-10-28 11:42:35 -07:00
Wink Saville
02d89898c9 am a2058e43: Merge change I11c3cdc7 into eclair
Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2

* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-28 11:42:07 -07:00
Mike Lockwood
8d1eeb2144 am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2

* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
2009-10-28 11:41:10 -07:00
Mike Lockwood
7c64d4486a am 8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '8061f64f6246116381131fc7951b6d88be37161a' into eclair-mr2

* commit '8061f64f6246116381131fc7951b6d88be37161a':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-28 11:40:47 -07:00
Dirk Dougherty
4c071f0d69 am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '59625fa86ad0e520931361aba120e2d868f01618' into eclair-mr2

* commit '59625fa86ad0e520931361aba120e2d868f01618':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 11:39:48 -07:00
Scott Main
66e6925154 am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4' into eclair-mr2

* commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4':
  docs: add 2.0 highlights doc and updated homepage
2009-10-28 11:39:26 -07:00
Dirk Dougherty
5397650963 am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-mr2

* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
  doc change: fix broken link at top of installing doc
2009-10-28 11:39:04 -07:00
Yu Shan Emily Lau
42ea8dc732 am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 11:38:34 -07:00