11257 Commits

Author SHA1 Message Date
Scott Main
0ae9e101a6 am e7672d00: am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01' into eclair-mr2-plus-aosp

* commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01':
  docs: add 2.0 video to developer site feature videos
2009-10-29 14:00:58 -07:00
Dirk Dougherty
524c4e720d am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '9ac642a924a85d26fb093a0c4aa0a20817927935' into eclair-mr2-plus-aosp

* commit '9ac642a924a85d26fb093a0c4aa0a20817927935':
  doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 14:00:39 -07:00
Andreas Huber
5647eebc3a am 9dba1f92: Merge change Ib482ce88 into eclair-mr2
Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp

* commit '9dba1f928021450f101013e03deacc9a0506772e':
  Revive support for video encoding in OMXCodec.
2009-10-29 14:00:16 -07:00
Scott Main
e7672d0041 am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-mr2

* commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120':
  docs: add 2.0 video to developer site feature videos
2009-10-29 13:41:06 -07:00
Dirk Dougherty
9ac642a924 am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-mr2

* commit '340fbc36fb5ded7819d09d55117917b9a6361fd4':
  doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 13:40:38 -07:00
Andy McFadden
cad9a4b046 am 66e06205: Another gcc 4.0.3 workaround.
Merge commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a' into eclair-mr2-plus-aosp

* commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a':
  Another gcc 4.0.3 workaround.
2009-10-29 13:20:46 -07:00
Android (Google) Code Review
9dba1f9280 Merge change Ib482ce88 into eclair-mr2
* changes:
  Revive support for video encoding in OMXCodec.
2009-10-29 16:20:43 -04:00
Andreas Huber
b482ce8837 Revive support for video encoding in OMXCodec. 2009-10-29 12:02:48 -07:00
Andy McFadden
66e0620503 Another gcc 4.0.3 workaround.
Temporarily make a function public that doesn't need to be.  When
host gcc-4.0.3 is gone from the build servers we can undo this.
2009-10-29 10:20:44 -07:00
Leon Scroggins
1f7253c3c2 am 5de6389f: DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Merge commit '5de6389f2252cb6e39918e21f80a08918e0c2c02' into eclair-mr2-plus-aosp

* commit '5de6389f2252cb6e39918e21f80a08918e0c2c02':
  DO NOT MERGE. Send a message when the picture changes and find is up to search again.
2009-10-29 10:10:00 -07:00
Leon Scroggins
5de6389f22 DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Fixes http://b/issue?id=2222706

Requires a change in external/webkit.  Not merging because the
change in webkit should be altered slightly.
2009-10-29 12:52:11 -04:00
Patrick Scott
9ad4274588 am 9d73409e: Merge change Ic5e3d73f into eclair-mr2
Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp

* commit '9d73409e76000f06a7ee3395241154a029152483':
  LOG_ASSERT needs a message.
2009-10-29 08:16:44 -07:00
Tom Taylor
6dd8a9351b am 3fc145aa: Merge change Ie8672184 into eclair-mr2
Merge commit '3fc145aafd4e04875ab3b67fed3429db30e15e48' into eclair-mr2-plus-aosp

* commit '3fc145aafd4e04875ab3b67fed3429db30e15e48':
  Add error code column to SMS
2009-10-29 08:16:25 -07:00
Android (Google) Code Review
9d73409e76 Merge change Ic5e3d73f into eclair-mr2
* changes:
  LOG_ASSERT needs a message.
2009-10-29 11:09:53 -04:00
Android (Google) Code Review
3fc145aafd Merge change Ie8672184 into eclair-mr2
* changes:
  Add error code column to SMS
2009-10-29 11:07:15 -04:00
Patrick Scott
c5e3d73f92 LOG_ASSERT needs a message.
This fails to build when asserts are turned on.
2009-10-29 08:31:36 -04:00
Eric Fischer
25510e0777 am 8071b146: am fb872d1a: Merge change Id4d04def into eclair
Merge commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7' into eclair-mr2-plus-aosp

* commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7':
  Fix a race that kept the locale picker from working under heavy CPU load.
2009-10-29 01:47:34 -07:00
Jean-Michel Trivi
5fc26f609a am ee507eb5: am 89889733: Merge change I4e83a76a into eclair
Merge commit 'ee507eb560319643946d73627bc7ad3e13591f2a' into eclair-mr2-plus-aosp

* commit 'ee507eb560319643946d73627bc7ad3e13591f2a':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-29 01:47:17 -07:00
Mike Lockwood
a41ff4b7c2 am c867958e: am d376d240: Merge change I081f08c1 into eclair
Merge commit 'c867958eb6fb50210a767fa24757bfa19228c22e' into eclair-mr2-plus-aosp

* commit 'c867958eb6fb50210a767fa24757bfa19228c22e':
  A better solution for ignoring user activity while the screen is animating off.
2009-10-29 01:46:47 -07:00
Mathias Agopian
2eca23d690 am a2151b2b: am 7bde36e6: added GL test for textured lines
Merge commit 'a2151b2b982cce5d424fdea2510ea9334a131475' into eclair-mr2-plus-aosp

* commit 'a2151b2b982cce5d424fdea2510ea9334a131475':
  added GL test for textured lines
2009-10-29 01:46:31 -07:00
Mathias Agopian
64d3f44c7b am 893cb4da: am 73e17015: Merge change I8d2de438 into eclair
Merge commit '893cb4da1034870a8814394a1c3bdac10ca6cadf' into eclair-mr2-plus-aosp

* commit '893cb4da1034870a8814394a1c3bdac10ca6cadf':
  fix [2143798] Need to figure out how to do video
2009-10-29 01:46:16 -07:00
Dave Sparks
0200ec3eb4 am b07d14c2: am 8321bdf4: Merge change I95529db1 into eclair
Merge commit 'b07d14c26ef33b8aa94a815273d6cb2caac180f5' into eclair-mr2-plus-aosp

* commit 'b07d14c26ef33b8aa94a815273d6cb2caac180f5':
  Add Free Flight ringtone to source tree.
2009-10-29 01:45:56 -07:00
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
Eric Fischer
8071b14680 am fb872d1a: Merge change Id4d04def into eclair
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-mr2

* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
  Fix a race that kept the locale picker from working under heavy CPU load.
2009-10-29 01:28:53 -07:00
Jean-Michel Trivi
ee507eb560 am 89889733: Merge change I4e83a76a into eclair
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2

* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-29 01:28:06 -07:00
Mike Lockwood
c867958eb6 am d376d240: Merge change I081f08c1 into eclair
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-mr2

* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
  A better solution for ignoring user activity while the screen is animating off.
2009-10-29 01:27:40 -07:00
Mathias Agopian
a2151b2b98 am 7bde36e6: added GL test for textured lines
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2

* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
  added GL test for textured lines
2009-10-29 01:27:18 -07:00
Mathias Agopian
893cb4da10 am 73e17015: Merge change I8d2de438 into eclair
Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-mr2

* commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694':
  fix [2143798] Need to figure out how to do video
2009-10-29 01:26:48 -07:00
Dave Sparks
b07d14c26e am 8321bdf4: Merge change I95529db1 into eclair
Merge commit '8321bdf4dd85b81224d84b0d7a2f53218bf1a250' into eclair-mr2

* commit '8321bdf4dd85b81224d84b0d7a2f53218bf1a250':
  Add Free Flight ringtone to source tree.
2009-10-29 01:25:17 -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