Commit Graph

7580 Commits

Author SHA1 Message Date
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
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
The Android Automerger
585099ab6b Merge branch 'eclair' into eclair-release 2009-12-10 09:01:46 -08:00
Trevor Johns
05d5b31d92 am b9b45a5e: Merge change I24bb662a into eclair
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-plus-aosp

* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
2009-12-09 23:46:01 -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
Dave Sparks
a15a3942d8 am 14f89404: Fix media player decode function. Bug 2317821.
Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-plus-aosp

* commit '14f8940472217e8b0164d8f213679710d623d528':
  Fix media player decode function. Bug 2317821.
2009-12-09 21:21:58 -08:00
Dianne Hackborn
fa6abcb413 am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37' into eclair-plus-aosp

* commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37':
  Fix #2313887: Device doesn't boot after rebooting device...
2009-12-09 18:48:42 -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
Scott Main
cb3dafc4bf am 88ff62db: Merge change I06398298 into eclair
Merge commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1' into eclair-plus-aosp

* commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1':
  docs: add images used in BT developer guide.
2009-12-09 18:25:37 -08:00
Xavier Ducrohet
eac13d3c33 am ce307f88: Merge change Ie4cdb5a3 into eclair
Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp

* commit 'ce307f889b509143899a2221359219fbc91b618c':
  Add --custom-package to aapt
2009-12-09 18:25:28 -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
Scott Main
a6a4213608 am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-plus-aosp

* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
  docs: add the Bluetooth developer guide,
2009-12-09 18:06:58 -08:00
Eric Fischer
410c21f562 am 282a7423: Merge change I3c299167 into eclair
Merge commit '282a742347bcb673f278c56b4dfede328a655296' into eclair-plus-aosp

* commit '282a742347bcb673f278c56b4dfede328a655296':
  Import revised translations.  DO NOT MERGE
2009-12-09 18:06:51 -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
Trevor Johns
c222d62fcb am abd6c278: Merge change I54400322 into eclair
Merge commit 'abd6c2782d1fe9816068003bc1d143dedd42de81' into eclair-plus-aosp

* commit 'abd6c2782d1fe9816068003bc1d143dedd42de81':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-09 17:55:37 -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
Jaikumar Ganesh
748db8c5b4 am f6e32e72: Merge change Icced7a09 into eclair
Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-plus-aosp

* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
  Maintain a list of all Bluetooth docks.
2009-12-09 17:02:25 -08:00
Android (Google) Code Review
6f346aca9b Merge change Icced7a09 into eclair
* changes:
  Maintain a list of all Bluetooth docks.
2009-12-09 17:00:09 -08:00
Mathias Agopian
b4f96937e3 am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e' into eclair-plus-aosp

* commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-09 16:40:20 -08:00
Mathias Agopian
c5e181f8b3 fix [2315900] Monochrome camera preview screen after launching camera
this was introduced by a recent change. when we try to figure out the size of
the yuv->rgb temporary buffer, the output resolution has not been computed yet
and an invalid buffer size is used. most of the time the allocation fails
and the system reverts to "standard" GL will uses onle the Y plane.

the allocation of the temporary buffer is moved to onDraw(), the first
time it is called, by that time, the window is positioned properly.
2009-12-09 15:26:29 -08:00
The Android Automerger
4493e4fb7f Merge branch 'eclair' into eclair-release 2009-12-09 14:46:49 -08:00
Jean-Michel Trivi
9176301692 am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-plus-aosp

* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-09 11:50:36 -08:00
Android (Google) Code Review
cb94f70d5c Merge change I0f73439a into eclair
* changes:
  Partially fix bug 2111240 Detect docking / undocking event by reporting to the AudioPolicyManager a new forced usage AudioSystem::FOR_DOCK which can take the FORCE_NONE, FORCE_BT_DOCK or FORCE_WIRED_ACCESSORY values. This CL is complemented by an update of the APM to take into account the FOR_DOCK usage.
2009-12-09 11:46:50 -08:00
Jason Sams
ed86324dc3 am 57ce0888: Merge change Id22c0137 into eclair
Merge commit '57ce0888fcb1376b385c3dab5e4262793acaaf16' into eclair-plus-aosp

* commit '57ce0888fcb1376b385c3dab5e4262793acaaf16':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-09 11:12:04 -08:00
Android (Google) Code Review
654fd5c185 Merge change Id22c0137 into eclair
* changes:
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-09 11:07:16 -08:00
The Android Automerger
53c4a2aa30 Merge branch 'eclair' into eclair-release 2009-12-09 08:50:34 -08:00
Mathias Agopian
98bc294a6f am d8c752ef: Merge change Ib548dbb2 into eclair
Merge commit 'd8c752ef74bc6d8b412defe35caf1a19be15eb8b' into eclair-plus-aosp

* commit 'd8c752ef74bc6d8b412defe35caf1a19be15eb8b':
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-09 05:36:07 -08:00
Android (Google) Code Review
8d96b7af4b Merge change Ib548dbb2 into eclair
* changes:
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-09 01:39:23 -08:00
Mathias Agopian
69ff5de1b7 improve video performance to minimize the tearing effect seen in 720p movies
always rescale videos to their target size using copybit during yuv->rgb
conversion. this improves performance of the GPU pass and doesn't require
linear filtering to be enabled. Also always use 16-bits buffers.

the average processing time for 720p dropped from ~50ms to ~30ms
2009-12-08 19:29:38 -08:00
Dianne Hackborn
6e68d6db17 am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-plus-aosp

* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
2009-12-08 18:44:22 -08:00
Android (Google) Code Review
4f22b67c93 Merge change Ifd95b9f5 into eclair
* changes:
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
2009-12-08 18:40:37 -08:00
Robert Greenwalt
a6944c51af am 68b15b68: Porting change I064698b3 from mr2 to eclair.
Merge commit '68b15b68497e373fe63a13f11e18349a738a7989' into eclair-plus-aosp

* commit '68b15b68497e373fe63a13f11e18349a738a7989':
  Porting change I064698b3 from mr2 to eclair.
2009-12-08 16:33:38 -08:00
Christopher Tate
701b6e887a am 767eb427: Merge change If990cab0 into eclair
Merge commit '767eb427fa8eca6c842c629cd4bfbf3551692148' into eclair-plus-aosp

* commit '767eb427fa8eca6c842c629cd4bfbf3551692148':
  Make sure to acknowledge stale broadcasts
2009-12-08 14:11:32 -08:00
Joe Onorato
de3f172071 am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '0d8055e51ce2666875e14c53e14765f673172b1c' into eclair-plus-aosp

* commit '0d8055e51ce2666875e14c53e14765f673172b1c':
  Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
2009-12-08 14:08:53 -08:00
Android (Google) Code Review
4d104e6d66 Merge change If990cab0 into eclair
* changes:
  Make sure to acknowledge stale broadcasts
2009-12-08 14:07:50 -08:00
The Android Automerger
58b1966822 Merge branch 'eclair' into eclair-release 2009-12-08 08:48:56 -08:00
Trevor Johns
f31c17fa69 am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-plus-aosp

* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
  Updating list of standard Intents in android.content.Intent
2009-12-07 22:43:09 -08:00
Wu-cheng Li
b04c935d64 am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-plus-aosp

* commit '9c79938d47a3caa06e5fb956955374f30c55992b':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-07 19:37:24 -08:00
Mike Lockwood
8dd16e0a79 am 7e90005f: Merge change I705b1d33 into eclair
Merge commit '7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-plus-aosp

* commit '7e90005fcb95d4c20c92e915f4418b94341dda36':
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-07 17:22:49 -08:00
Android (Google) Code Review
fe07788498 Merge change I705b1d33 into eclair
* changes:
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-07 17:17:47 -08:00
Fred Quintana
b37c4e12b3 am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-plus-aosp

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
2009-12-07 17:04:43 -08:00
Android (Google) Code Review
b7e2059005 Merge change Ia5ef9acd into eclair
* changes:
  remove an old STOPSHIP comment
2009-12-07 16:59:46 -08:00
Jaikumar Ganesh
cacb99c079 am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-plus-aosp

* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
  Add API to get Active Sinks.
2009-12-07 15:52:28 -08:00
Android (Google) Code Review
d958f3c7bb Merge change I38227501 into eclair
* changes:
  Add API to get Active Sinks.
2009-12-07 15:49:50 -08:00
Robert Greenwalt
a32500e560 am 9ae9763b: Merge change Ib097fbbf into eclair
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-plus-aosp

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:31:29 -08:00
Jaikumar Ganesh
234d6e53cb am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-plus-aosp

* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:31:24 -08:00
Android (Google) Code Review
6c0dae34e2 Merge change Ib097fbbf into eclair
* changes:
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:27:19 -08:00