Commit Graph

8838 Commits

Author SHA1 Message Date
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
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
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
Adam Powell
83786300ea am 326d808b: Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
Merge commit '326d808b858359464b2ffeb84f2e0a8e0c79b600' into eclair-mr2-plus-aosp

* commit '326d808b858359464b2ffeb84f2e0a8e0c79b600':
  Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
2009-12-10 15:18:43 -08:00
Romain Guy
03f38be81d am f2f68760: Merge change Ib3d582d7 into eclair-mr2
Merge commit 'f2f68760eb10b52bd53d6a266f9b5e2b06037d9f' into eclair-mr2-plus-aosp

* commit 'f2f68760eb10b52bd53d6a266f9b5e2b06037d9f':
  Fix crash with @UiThreadTest in InstrumentationTestCase.
2009-12-10 13:50:11 -08:00
Android (Google) Code Review
39dd163183 Merge change Ib3d582d7 into eclair-mr2
* changes:
  Fix crash with @UiThreadTest in InstrumentationTestCase.
2009-12-10 13:46:10 -08:00
Andreas Huber
fa8dceeeea am eec100b2: Merge change If0d04246 into eclair-mr2
Merge commit 'eec100b2f44caaea048d3abd898df3c7308865d5' into eclair-mr2-plus-aosp

* commit 'eec100b2f44caaea048d3abd898df3c7308865d5':
  Don't count empty buffers when computing the frame rate.
2009-12-10 13:14:33 -08:00
Android (Google) Code Review
6406aba945 Merge change If0d04246 into eclair-mr2
* changes:
  Don't count empty buffers when computing the frame rate.
2009-12-10 13:11:50 -08:00
Andreas Huber
3416c15e0d am 6ae24d93: Merge change I3c01bb62 into eclair-mr2
Merge commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6' into eclair-mr2-plus-aosp

* commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6':
  Adding copyright headers to recently introduced decoder source files.
2009-12-10 12:42:18 -08:00
Android (Google) Code Review
49890fdd68 Merge change I3c01bb62 into eclair-mr2
* changes:
  Adding copyright headers to recently introduced decoder source files.
2009-12-10 12:37:59 -08:00
Andreas Huber
785e0eaf75 am 987e7fb2: Merge change I9a275773 into eclair-mr2
Merge commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb' into eclair-mr2-plus-aosp

* commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb':
  Initial check in of AMR (NB and WB) decoders based on PV source code.
2009-12-10 12:32:31 -08:00
Android (Google) Code Review
4cf3d84549 Merge change I9a275773 into eclair-mr2
* changes:
  Initial check in of AMR (NB and WB) decoders based on PV source code.
2009-12-10 12:29:39 -08:00
Romain Guy
0634f06b97 am f44ecff4: Merge change Id432656e into eclair-mr2
Merge commit 'f44ecff46732f30977da91eb9614673bad8282f8' into eclair-mr2-plus-aosp

* commit 'f44ecff46732f30977da91eb9614673bad8282f8':
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
2009-12-10 11:59:15 -08:00
Fred Quintana
9c2b636c7f am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java
Merge commit '97ef7637c6799e72956db8e08192539f1b1942f6' into eclair-mr2-plus-aosp

* commit '97ef7637c6799e72956db8e08192539f1b1942f6':
  - move the EventLog stuff out of ATSA
2009-12-10 11:55:30 -08:00
Android (Google) Code Review
55f78f8ef6 Merge change Id432656e into eclair-mr2
* changes:
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
2009-12-10 11:54:13 -08:00
Doug Zongker
8011c34fc4 am b3c1f1cf: Merge change I7daa7ae8 into eclair-mr2
Merge commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4' into eclair-mr2-plus-aosp

* commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4':
  move event log tags used by SyncAdapter into a local .logtags file
2009-12-10 10:21:39 -08:00
Android (Google) Code Review
0df13ef9cc Merge change I7daa7ae8 into eclair-mr2
* changes:
  move event log tags used by SyncAdapter into a local .logtags file
2009-12-10 10:17:17 -08:00
Android (Google) Code Review
c0012deacc Merge change I24bb662a into eclair
* changes:
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
2009-12-09 23:42:13 -08:00
Bjorn Bringert
5bae9f5eb3 am 159f0015: Merge change I98819b18 into eclair-mr2
Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp

* commit '159f0015418955501d8cf2744b0393db2e73f394':
  Allow resource and file URIs in ImageView.setImageURI()
2009-12-09 23:35:07 -08:00
Bjorn Bringert
c94294fe69 am 45e77ce3: Merge change I154386b1 into eclair-mr2
Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp

* commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212':
  Use unbundled QSB for global search
2009-12-09 23:34:57 -08:00
Android (Google) Code Review
07b4185c74 Merge change I98819b18 into eclair-mr2
* changes:
  Allow resource and file URIs in ImageView.setImageURI()
2009-12-09 23:32:58 -08:00
Android (Google) Code Review
c2f49e67e9 Merge change I154386b1 into eclair-mr2
* changes:
  Use unbundled QSB for global search
2009-12-09 23:32:31 -08:00
Android (Google) Code Review
054fbe7829 Merge change Ia48b3f2a into eclair
* changes:
  Fix #2313887: Device doesn't boot after rebooting device...
2009-12-09 18:41:04 -08:00
Android (Google) Code Review
d23bf4c1e7 Merge change I06398298 into eclair
* changes:
  docs: add images used in BT developer guide.
2009-12-09 18:20:21 -08:00
Android (Google) Code Review
0ef402831a Merge change Ie4cdb5a3 into eclair
* changes:
  Add --custom-package to aapt
2009-12-09 18:09:49 -08:00
Android (Google) Code Review
9eab12e8c4 Merge change I3c299167 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-12-09 17:59:07 -08:00
Android (Google) Code Review
9c8ab6a20a Merge change I54400322 into eclair
* changes:
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-09 17:51:34 -08:00