Commit Graph

11501 Commits

Author SHA1 Message Date
Dianne Hackborn
7c2910e2ae am 436b93b5: am 221fa910: am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit '436b93b5f577549801489bff228f1a5761f331ff'

* commit '436b93b5f577549801489bff228f1a5761f331ff':
  Fix #2313887: Device doesn't boot after rebooting device...
2009-12-10 23:46:00 -08:00
Scott Main
240d690dd7 am 94065a29: am f210f048: am 88ff62db: Merge change I06398298 into eclair
Merge commit '94065a29c1c68ecf6aa0979a4c91f2616227f264'

* commit '94065a29c1c68ecf6aa0979a4c91f2616227f264':
  docs: add images used in BT developer guide.
2009-12-10 23:45:48 -08:00
Jean-Baptiste Queru
80cdd350d5 am 926d1a22: am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2
Merge commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e'

* commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e':
  Add --custom-package to aapt
2009-12-10 23:43:25 -08:00
Scott Main
0ac7df4453 am 4570dfa2: am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d'

* commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d':
  docs: add the Bluetooth developer guide,
2009-12-10 23:43:12 -08:00
Eric Fischer
e3ba492e75 am 71988369: (-s ours) am 4d272fe9: am 282a7423: (-s ours) Merge change I3c299167 into eclair
Merge commit '71988369e394870056a55ca142fd4aaf5264ef41'

* commit '71988369e394870056a55ca142fd4aaf5264ef41':
  Import revised translations.  DO NOT MERGE
2009-12-10 23:42:58 -08:00
Trevor Johns
8920dcacbc am 8a00170a: am 1d3a94a8: am abd6c278: Merge change I54400322 into eclair
Merge commit '8a00170ad077e73fee4b379d15015b880ba39fde'

* commit '8a00170ad077e73fee4b379d15015b880ba39fde':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-10 23:42:44 -08:00
Jaikumar Ganesh
a563def03c am a8ba9f20: am 368c332d: am f6e32e72: Merge change Icced7a09 into eclair
Merge commit 'a8ba9f20ea7b3eae0430baefe8681cba285565f4'

* commit 'a8ba9f20ea7b3eae0430baefe8681cba285565f4':
  Maintain a list of all Bluetooth docks.
2009-12-10 23:42:30 -08:00
Mathias Agopian
b478159bb3 am abcb3703: am 75ca58d6: am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39'

* commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-10 23:42:13 -08:00
Wink Saville
1ff13549c0 am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c' into eclair-mr2-plus-aosp

* commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c':
  Implement a HierarchicalStateMachine
2009-12-10 21:24:59 -08:00
Android (Google) Code Review
eb301e0ace Merge change I0a56959e into eclair-mr2
* changes:
  Implement a HierarchicalStateMachine
2009-12-10 21:22:19 -08:00
Kenny Root
8d8dd49ab9 am b5ef7ee1: Default to UTF8 resources when packaging with aapt
Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp

* commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3':
  Default to UTF8 resources when packaging with aapt
2009-12-10 20:23:04 -08:00
Roman Nurik
0c5e0eb152 am 05bbeb35: am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '05bbeb356286bfb6ddc26ac546cce03334e346dd' into eclair-mr2-plus-aosp

* commit '05bbeb356286bfb6ddc26ac546cce03334e346dd':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
2009-12-10 19:57:39 -08:00
Mathias Agopian
fc01eaf5da am 02472639: am 083a557c: fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit '024726391ad1536c5fa4af3f786141e200efed54' into eclair-mr2-plus-aosp

* commit '024726391ad1536c5fa4af3f786141e200efed54':
  fix [2319255] crash in openGL : from the media recorder stress test.
2009-12-10 19:57:32 -08:00
Roman Nurik
ce704768e1 am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-mr2

* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
2009-12-10 19:48:47 -08:00
Mathias Agopian
3fb6f499f8 am 083a557c: fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit '083a557c25e0032bc4900f335b6643d0badd09ce' into eclair-mr2

* commit '083a557c25e0032bc4900f335b6643d0badd09ce':
  fix [2319255] crash in openGL : from the media recorder stress test.
2009-12-10 19:48:05 -08:00
Kenny Root
50f981dc79 am 218aa945: Merge change I6478884a into eclair-mr2
Merge commit '218aa94581293876a4283f8d5908843c8f818e3a' into eclair-mr2-plus-aosp

* commit '218aa94581293876a4283f8d5908843c8f818e3a':
  Add string resource type inspection
2009-12-10 18:10:33 -08:00
Trevor Johns
ce30694a98 am 9de0dba3: am b9b45a5e: Merge change I24bb662a into eclair
Merge commit '9de0dba37cdb74a21e561c5235757318f1812e3d' into eclair-mr2-plus-aosp

* commit '9de0dba37cdb74a21e561c5235757318f1812e3d':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
2009-12-10 18:08:17 -08:00
Dave Sparks
1a933b68de am 9472b35b: am 14f89404: Fix media player decode function. Bug 2317821.
Merge commit '9472b35ba190b24f811ff7b025a93b2023dbd58d' into eclair-mr2-plus-aosp

* commit '9472b35ba190b24f811ff7b025a93b2023dbd58d':
  Fix media player decode function. Bug 2317821.
2009-12-10 18:08:10 -08:00
Dianne Hackborn
4cb67ef5f0 am 221fa910: am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit '221fa910301606f8374d97e538af11c3416a76a2' into eclair-mr2-plus-aosp

* commit '221fa910301606f8374d97e538af11c3416a76a2':
  Fix #2313887: Device doesn't boot after rebooting device...
2009-12-10 18:08:01 -08:00
Scott Main
344f016359 am f210f048: am 88ff62db: Merge change I06398298 into eclair
Merge commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed' into eclair-mr2-plus-aosp

* commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed':
  docs: add images used in BT developer guide.
2009-12-10 18:07:53 -08:00
Android (Google) Code Review
2c05ff5518 Merge change I6478884a into eclair-mr2
* changes:
  Add string resource type inspection
2009-12-10 18:05:19 -08:00
Trevor Johns
f4f3a46807 am b9b45a5e: Merge change I24bb662a into eclair
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-mr2

* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
2009-12-10 17:57:59 -08:00
Dave Sparks
1938c08312 am 14f89404: Fix media player decode function. Bug 2317821.
Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-mr2

* commit '14f8940472217e8b0164d8f213679710d623d528':
  Fix media player decode function. Bug 2317821.
2009-12-10 17:57:10 -08:00
Jean-Baptiste Queru
ab5c9d9743 am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2
Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
  Add --custom-package to aapt
2009-12-10 17:57:04 -08:00
Dianne Hackborn
8778ae2ffc am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37' into eclair-mr2

* commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37':
  Fix #2313887: Device doesn't boot after rebooting device...
2009-12-10 17:56:39 -08:00
Scott Main
0fba8280e5 am 88ff62db: Merge change I06398298 into eclair
Merge commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1' into eclair-mr2

* commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1':
  docs: add images used in BT developer guide.
2009-12-10 17:56:28 -08:00
Scott Main
854ad68046 am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit '7b0463a949b57620680b95e45c66a05f67426b74' into eclair-mr2-plus-aosp

* commit '7b0463a949b57620680b95e45c66a05f67426b74':
  docs: add the Bluetooth developer guide,
2009-12-10 17:53:27 -08:00
Jean-Baptiste Queru
c90e4fc75e resolved conflicts for merge of ce307f88 to eclair-mr2 2009-12-10 17:53:27 -08:00
Eric Fischer
8be6d61d93 am 4d272fe9: am 282a7423: (-s ours) Merge change I3c299167 into eclair
Merge commit '4d272fe9e0e6f606535ef4a297337e6272c708b4' into eclair-mr2-plus-aosp

* commit '4d272fe9e0e6f606535ef4a297337e6272c708b4':
  Import revised translations.  DO NOT MERGE
2009-12-10 17:53:20 -08:00
Trevor Johns
92fbba5574 am 1d3a94a8: am abd6c278: Merge change I54400322 into eclair
Merge commit '1d3a94a8b4972f28c75c2d01ed4cf686a47ca6d8' into eclair-mr2-plus-aosp

* commit '1d3a94a8b4972f28c75c2d01ed4cf686a47ca6d8':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-10 17:53:12 -08:00
Jaikumar Ganesh
d6b2b0b333 am 368c332d: am f6e32e72: Merge change Icced7a09 into eclair
Merge commit '368c332ddc804d5fb0bb2362f658e7a3706fb003' into eclair-mr2-plus-aosp

* commit '368c332ddc804d5fb0bb2362f658e7a3706fb003':
  Maintain a list of all Bluetooth docks.
2009-12-10 17:53:04 -08:00
Mathias Agopian
f9ad794100 am 75ca58d6: am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit '75ca58d6f877541516f4f2710b4bed39fa7c4266' into eclair-mr2-plus-aosp

* commit '75ca58d6f877541516f4f2710b4bed39fa7c4266':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-10 17:52:55 -08:00
Scott Main
9c006db353 am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-mr2

* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
  docs: add the Bluetooth developer guide,
2009-12-10 17:42:55 -08:00
Eric Fischer
3653f2e9cc am 282a7423: (-s ours) Merge change I3c299167 into eclair
Merge commit '282a742347bcb673f278c56b4dfede328a655296' into eclair-mr2

* commit '282a742347bcb673f278c56b4dfede328a655296':
  Import revised translations.  DO NOT MERGE
2009-12-10 17:42:43 -08:00
Trevor Johns
aa663206b9 am abd6c278: Merge change I54400322 into eclair
Merge commit 'abd6c2782d1fe9816068003bc1d143dedd42de81' into eclair-mr2

* commit 'abd6c2782d1fe9816068003bc1d143dedd42de81':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-10 17:41:45 -08:00
Jaikumar Ganesh
137940b87c am f6e32e72: Merge change Icced7a09 into eclair
Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-mr2

* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
  Maintain a list of all Bluetooth docks.
2009-12-10 17:40:53 -08:00
Mathias Agopian
b2bf11e389 am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e' into eclair-mr2

* commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-10 17:40:41 -08:00
Jean-Michel Trivi
2841ac53cc am 899858a3: am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9'

* commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 17:15:22 -08:00
Jason Sams
dd78738966 am b62954b6: am 8f31c230: am 57ce0888: Merge change Id22c0137 into eclair
Merge commit 'b62954b66542e3e2654d97a81123c51805bceca7'

* commit 'b62954b66542e3e2654d97a81123c51805bceca7':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 17:15:13 -08:00
Mathias Agopian
2de0b02720 am d1b8019a: am ae5bd2b9: am d8c752ef: Merge change Ib548dbb2 into eclair
Merge commit 'd1b8019a69d186df74f072cc51b413e34c3016f4'

* commit 'd1b8019a69d186df74f072cc51b413e34c3016f4':
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-10 17:15:02 -08:00
Roman Nurik
ca82b3899d am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-plus-aosp

* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
2009-12-10 17:07:00 -08:00
Android (Google) Code Review
f414887b3c Merge change I18305fec into eclair
* changes:
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
2009-12-10 17:03:30 -08:00
Jean-Michel Trivi
10ec8aed0b am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b' into eclair-mr2-plus-aosp

* commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 16:58:35 -08:00
Jason Sams
74ea040af0 am 8f31c230: am 57ce0888: Merge change Id22c0137 into eclair
Merge commit '8f31c23021a3f8164eee08cf904c3f083ddfc3d2' into eclair-mr2-plus-aosp

* commit '8f31c23021a3f8164eee08cf904c3f083ddfc3d2':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 16:58:28 -08:00
Mathias Agopian
661cb51a1a am ae5bd2b9: am d8c752ef: Merge change Ib548dbb2 into eclair
Merge commit 'ae5bd2b9cc36a21b890ded808d9374ab02364d1d' into eclair-mr2-plus-aosp

* commit 'ae5bd2b9cc36a21b890ded808d9374ab02364d1d':
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-10 16:58:18 -08:00
Jean-Michel Trivi
1aa171322a am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-mr2

* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 16:46:13 -08:00
Jason Sams
1c3bb3f985 am 57ce0888: Merge change Id22c0137 into eclair
Merge commit '57ce0888fcb1376b385c3dab5e4262793acaaf16' into eclair-mr2

* commit '57ce0888fcb1376b385c3dab5e4262793acaaf16':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 16:45:22 -08:00
Mathias Agopian
495c1be363 am d8c752ef: Merge change Ib548dbb2 into eclair
Merge commit 'd8c752ef74bc6d8b412defe35caf1a19be15eb8b' into eclair-mr2

* commit 'd8c752ef74bc6d8b412defe35caf1a19be15eb8b':
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-10 16:43:09 -08:00
Mathias Agopian
74aba3d9db am 083a557c: fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit '083a557c25e0032bc4900f335b6643d0badd09ce' into eclair-plus-aosp

* commit '083a557c25e0032bc4900f335b6643d0badd09ce':
  fix [2319255] crash in openGL : from the media recorder stress test.
2009-12-10 16:08:12 -08:00
Mathias Agopian
8f03b47432 fix [2319255] crash in openGL : from the media recorder stress test.
never call eglCreateImageKHR() with a NULL native buffer, which can
happen in OOM conditions.
2009-12-10 15:59:08 -08:00