Commit Graph

8873 Commits

Author SHA1 Message Date
Grace Kloba
f7755388a6 am 70b942d3: Post a Runnable to execute setNewZoomScale when WebView\'s onSizeChanged is called. This will ensure requestLayout of the Child View works.
Merge commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853' into eclair-mr2-plus-aosp

* commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853':
  Post a Runnable to execute setNewZoomScale when
2009-12-12 15:08:22 -08:00
Andreas Huber
25eebe07d7 am 08945576: Merge change I9ac0777e into eclair-mr2
Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp

* commit '089455760c05289c1315268a6cb896577ceebc64':
  Initial checkin of software AMR NB encoder based on PV source code.
2009-12-11 15:44:59 -08:00
Android (Google) Code Review
afdd49fa24 Merge change I9ac0777e into eclair-mr2
* changes:
  Initial checkin of software AMR NB encoder based on PV source code.
2009-12-11 15:39:17 -08:00
Dan Egnor
60a5ad8be7 am b7f0367c: Eliminate CrashData and friends.
Merge commit 'b7f0367cec1c744aa66ef397b0244e25d507491c' into eclair-mr2-plus-aosp

* commit 'b7f0367cec1c744aa66ef397b0244e25d507491c':
  Eliminate CrashData and friends.
2009-12-11 14:32:40 -08:00
Christopher Tate
fd47cf27bf am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2
Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp

* commit 'af1255dab8fa3eab1caf9bae799f80de14a74470':
  Fix #2320798: Device hang then runtime restart
2009-12-11 13:20:15 -08:00
Christopher Tate
7d900f2697 resolved conflicts for merge of 2624fbca to eclair-mr2 2009-12-11 13:16:41 -08:00
Andreas Huber
23e1b91e2c am 8eac1637: Merge change I85adf5e5 into eclair-mr2
Merge commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23' into eclair-mr2-plus-aosp

* commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23':
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 13:01:12 -08:00
Android (Google) Code Review
a22790ef39 Merge change I85adf5e5 into eclair-mr2
* changes:
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 12:56:30 -08:00
Ken Shirriff
f22f7af324 am 930ab3d9: Fix broken sdk build.
Merge commit '930ab3d955a40c1de167b7142215af37f9f9bfe4' into eclair-mr2-plus-aosp

* commit '930ab3d955a40c1de167b7142215af37f9f9bfe4':
  Fix broken sdk build.
2009-12-11 12:38:07 -08:00
Andreas Huber
2050e777ca am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Merge commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b' into eclair-mr2-plus-aosp

* commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b':
  Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
2009-12-11 10:06:30 -08:00
Andreas Huber
8abcc28ddc am 6ddcf01a: remote destructors are not synchronously executed by the binder...
Merge commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1' into eclair-mr2-plus-aosp

* commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1':
  remote destructors are not synchronously executed by the binder...
2009-12-11 09:09:29 -08:00
Andreas Huber
06db96d79e am c1d5c921: Fix seek-on-startup behaviour in AwesomePlayer.
Merge commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2' into eclair-mr2-plus-aosp

* commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2':
  Fix seek-on-startup behaviour in AwesomePlayer.
2009-12-11 09:06:43 -08:00
Andreas Huber
eda23f2942 am b78599b7: Merge change Ia67d5388 into eclair-mr2
Merge commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740' into eclair-mr2-plus-aosp

* commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740':
  remote destructors are not synchronously executed by the binder...
2009-12-11 09:06:36 -08:00
Android (Google) Code Review
43f36c1ec6 Merge change Ia67d5388 into eclair-mr2
* changes:
  remote destructors are not synchronously executed by the binder...
2009-12-11 08:48:47 -08:00
Mike Reed
162e378dc5 am 6cb69c7d: Merge change I8b302097 into eclair-mr2
Merge commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584' into eclair-mr2-plus-aosp

* commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584':
  Update the zoom buttons after moving to a new page.
2009-12-11 08:44:40 -08:00
Andreas Huber
1854223d3c am fd499830: Merge change I595c2d60 into eclair-mr2
Merge commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c' into eclair-mr2-plus-aosp

* commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c':
  Initial checkin of software AVC video decoder based on PV source code.
2009-12-11 08:43:01 -08:00
Android (Google) Code Review
153d3158b4 Merge change I8b302097 into eclair-mr2
* changes:
  Update the zoom buttons after moving to a new page.
2009-12-11 08:42:13 -08:00
Android (Google) Code Review
9a044a685f Merge change I595c2d60 into eclair-mr2
* changes:
  Initial checkin of software AVC video decoder based on PV source code.
2009-12-11 08:39:00 -08:00
Maryam Garrett
e47f7cf6e1 am 946bfa49: Merge change Ida4d6ab0 into eclair-mr2
Merge commit '946bfa490a4df62bfb48e8017c329b052e3e905e' into eclair-mr2-plus-aosp

* commit '946bfa490a4df62bfb48e8017c329b052e3e905e':
  Allows users to scroll while in select mode.
2009-12-11 06:27:21 -08:00
Mathias Agopian
7f7a38f30a am b63d91c6: am f9b0e826: fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
Merge commit 'b63d91c6fc90ee8f71bad9380b45dfe6b5d96f57' into eclair-mr2-plus-aosp

* commit 'b63d91c6fc90ee8f71bad9380b45dfe6b5d96f57':
  fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
2009-12-11 06:27:13 -08:00
Android (Google) Code Review
5c05b4dcc1 Merge change Ida4d6ab0 into eclair-mr2
* changes:
  Allows users to scroll while in select mode.
2009-12-11 06:22:12 -08:00
Mathias Agopian
839604c769 am f9b0e826: fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
Merge commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2' into eclair-mr2

* commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2':
  fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
2009-12-11 01:16:08 -08:00
Mathias Agopian
f5430db059 fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
When a surface is removed from the screen while it holds a "freeze lock", the
release of that lock happens in the destructor as a "safety net". However, it
doesn't trigger an update at that point.

Make sure that "freeze locks" are released from the transaction at the point
a surface is removed from the screen (if it's not on screen, it shouldn't
prevent the screen to redraw, and therefore cannot hold a freeze lock).
The refresh corresponding to that transaction will pick it up as soon as possible.
2009-12-11 00:56:10 -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