Commit Graph

6267 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
c90e4fc75e resolved conflicts for merge of ce307f88 to eclair-mr2 2009-12-10 17:53:27 -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
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
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
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
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
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
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
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
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
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
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
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
Android (Google) Code Review
0a337d67ce Merge change I2cb78a66 into eclair-mr2
* changes:
  Add convenience function to MediaStore to move a playlist item to a different location.
2009-12-09 14:22:47 -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
Android (Google) Code Review
7876f22c90 Merge change Id469ba88 into eclair-mr2
* changes:
  Listen for window orientation events.
2009-12-09 11:30:00 -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
Android (Google) Code Review
a3260ecb4d Merge change I75481cb8 into eclair-mr2
* changes:
  Check that the resolved activity is not in our package.
2009-12-09 09:52:24 -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
Jack Palevich
3cd7add35e Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
2009-12-09 16:34:46 +08:00
Jack Palevich
5d0eb3ee89 Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context
Provide a new method, GLSurfaceView.setEGLContextClientVersion. Clients
call this method to define which level of OpenGL ES support they want.

This method only affects the default behavior of GLSurfaceView. If clients
have supplied their own EGLContextFactory or EGLConfigChooser then they
are on their own if they want to create an OpenGL ES 2.0 context.

This API is currently hidden.

Update the gl2_java test to use this new API.

Update the gl2_java test's AndroidManifest.xml file to indicate that
it requires OpenGL ES 2.0.
2009-12-09 16:34:34 +08:00
Jack Palevich
b3a5352b96 Add a Java API for OpenGL ES 2.0.
Currently this API is hidden.

Add a test program.
2009-12-09 16:34:33 +08:00
Android (Google) Code Review
ccaf45c5ed Merge change Iafbeb31b into eclair-mr2
* changes:
  Maybe really fix windows build.
2009-12-08 19:47:54 -08:00
Dianne Hackborn
d0aeccebe2 Maybe really fix windows build. 2009-12-08 19:45:59 -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
17c4807d8e am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-mr2

* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
2009-12-08 18:44:03 -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
Android (Google) Code Review
80240139e3 Merge change I06fb2c1c into eclair-mr2
* changes:
  Hopefully fix Windows build
2009-12-08 18:05:58 -08:00
Android (Google) Code Review
efc49294a6 Merge change Iead0d4d8 into eclair-mr2
* changes:
  Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
2009-12-08 17:34:56 -08:00
Android (Google) Code Review
18a3e00cee Merge change I36785a9d into eclair-mr2
* changes:
  Telephony: Make resetting radio on a radio technology change optional
2009-12-08 16:59:22 -08:00
Dianne Hackborn
c5b138995e Hopefully fix Windows build 2009-12-08 16:38:01 -08:00
Android (Google) Code Review
426ab667ca Merge change Iee7f2457 into eclair-mr2
* changes:
  Deleted Gmail.java from frameworks.  Previously it had been moved to vendor/google/.../Gmail/...
2009-12-08 16:35:05 -08:00
Android (Google) Code Review
e7c211b260 Merge change Ia53c6725 into eclair-mr2
* changes:
  Add bindService API to not bring ot foreground.
2009-12-08 16:34:48 -08:00
Robert Greenwalt
95f0dde9a0 am 68b15b68: Porting change I064698b3 from mr2 to eclair.
Merge commit '68b15b68497e373fe63a13f11e18349a738a7989' into eclair-mr2

* commit '68b15b68497e373fe63a13f11e18349a738a7989':
  Porting change I064698b3 from mr2 to eclair.
2009-12-08 16:33:59 -08:00
Android (Google) Code Review
d85f7413c1 Merge change I0743a389 into eclair-mr2
* changes:
  Close popup when Keyboard gets a CANCEL motion event.
2009-12-08 14:37:38 -08:00
Christopher Tate
9356022bfa am 767eb427: Merge change If990cab0 into eclair
Merge commit '767eb427fa8eca6c842c629cd4bfbf3551692148' into eclair-mr2

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

* commit '0d8055e51ce2666875e14c53e14765f673172b1c':
  Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
2009-12-08 14:08:51 -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
Android (Google) Code Review
d741abc373 Merge change Ifb0a0398 into eclair-mr2
* changes:
  Fix build breakage.  Rename NetStat to TrafficStats in preloaded-classes.
2009-12-08 13:46:49 -08:00