Commit Graph

32860 Commits

Author SHA1 Message Date
Eino-Ville Talvala
2e2132d773 Merge "Add a simple OpenGL ES 2.0 test program that displays a camera preview stream." 2011-03-29 13:34:03 -07:00
Andreas Huber
343b539281 Merge "Adding support for the '.mxmf' MIDI file extension." 2011-03-29 13:33:58 -07:00
Bart Sears
a129d4434f am 7cad54cb: (-s ours) am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
* commit '7cad54cb8283b67e5d4106112772dc038b7dbb40':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:23:55 -07:00
Huahui Wu
b8f4d6d997 am 97621525: (-s ours) am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
* commit '97621525c54057550dc40b38dcbe03de70cadd87':
  DO NOT MERGE
2011-03-29 13:23:52 -07:00
Bart Sears
5116244797 am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:19:07 -07:00
Huahui Wu
ec3a0e5ef6 am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
* commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6':
  DO NOT MERGE
2011-03-29 13:19:01 -07:00
Eric Fischer
c2cb14c6c0 am 7d5ae753: (-s ours) am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '7d5ae7537858d6b01ae2ce12e34cb0a284138ccf':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:30:12 -07:00
Eric Fischer
711b114c19 am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:27:29 -07:00
Andreas Huber
ccec7a73a4 Merge "Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread." 2011-03-29 12:23:34 -07:00
Eric Fischer
b358e1c9e4 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:20:42 -07:00
Eric Fischer
09f54780c0 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-29 12:16:53 -07:00
David Li
214c31dbe5 Merge "GLES2Dbg: use 256KB chunks for lzf compression" 2011-03-29 12:00:07 -07:00
Amith Yamasani
a0ab9784ec Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" 2011-03-29 10:46:59 -07:00
Brad Fitzpatrick
eb797b1fd5 am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
13e41db3a1 Merge "Error in compound cache-control header." 2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
12c059e903 am fae5e289: am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit 'fae5e2894ff3c09f27efac2a7ee6b9cfd4ed14b0':
  Making it possible to call SIP calls with special allowed chars.
2011-03-29 08:53:48 -07:00
Brad Fitzpatrick
5608d20a33 am 8ef609ab: am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit '8ef609abe56c9872c93fc304037d1e52d4475e5e':
  Fixing the wrong link in YuvImage JavaDoc.
2011-03-29 08:53:38 -07:00
Brad Fitzpatrick
6462cb9ca7 am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
  Making it possible to call SIP calls with special allowed chars.
2011-03-29 08:45:30 -07:00
Brad Fitzpatrick
daf1df6b4e am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit 'a4206029cbb8f6c02c47db52f84b7d52e154e35a':
  Fixing the wrong link in YuvImage JavaDoc.
2011-03-29 08:45:20 -07:00
Bill Gruber
92864d200a am 67a249d6: am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch
* commit '67a249d607e029650104ca71373b09b852614725':
  IAB doc update for final launch
2011-03-29 00:12:49 -07:00
Bill Gruber
c7578958fd am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch
* commit '0b0dbea0bc38087dfa3e82b91c0381154bb8bdfd':
  IAB doc update for final launch
2011-03-29 00:06:18 -07:00
Bill Gruber
e170d21bce am e4f33617: am faede250: IAB doc update for final launch
* commit 'e4f33617c3654bdcb246ee8f74e67d1828cd42c9':
  IAB doc update for final launch
2011-03-29 00:00:37 -07:00
Bill Gruber
aea82d0332 am faede250: IAB doc update for final launch
* commit 'faede250301e291a060d094c73a25a351f96cbb5':
  IAB doc update for final launch
2011-03-28 23:48:34 -07:00
Jeff Sharkey
26b320dc9b Merge "Support Ctrl-based EditText movement." 2011-03-28 19:57:10 -07:00
Matthew Xie
5c820881ab Merge "Use mask_eighth_bit function to replace is_ascii check." 2011-03-28 18:13:59 -07:00
Jack Palevich
3d548ff9c9 Merge "Add Java support for a few accidentally omitted OpenGL ES APIs." 2011-03-28 17:08:50 -07:00
Iliyan Malchev
15adb601ed Merge "frameworks/base: some camera-interface cleanup" 2011-03-28 17:07:02 -07:00
Eino-Ville Talvala
55c617aa2d Add a simple OpenGL ES 2.0 test program that displays a camera preview stream.
Uses a SurfaceTexture feeding into a OpenGL ES2 GLSurfaceView. Also
uses accelerometer data and SurfaceTexture-provided timestamps for a
simple physics simulation which moves the camera preview oval in
response to device movement.

Change-Id: I275a0c6a4e25829d617e635b25e70e2a9c8455cb
2011-03-28 15:27:19 -07:00
Jack Palevich
62d08f5bc3 Add Java support for a few accidentally omitted OpenGL ES APIs.
Fixes 3491494 Support OpenGL APIs: glBlendEquationSeparate and friends

Change-Id: I8fdc94b6ea14e9a7e3d402a965d500790a3d8f77
2011-03-28 14:49:12 -07:00
Wink Saville
8858c325b5 am 94a19db5: am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
* commit '94a19db5a78d3f43b01fa10bd09788f68debbcab':
  DataConnectionTracker cleanup when disposed.
2011-03-28 12:15:28 -07:00
Wink Saville
c35acb7faf am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
* commit '59d1b26a6a4b9b2de829d62af2179f57deb79391':
  DataConnectionTracker cleanup when disposed.
2011-03-28 12:13:22 -07:00
Wink Saville
7e0531e7ab Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 2011-03-28 12:11:42 -07:00
Mike Lockwood
71ab200776 am 038c7297: am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '038c7297c9e2e4b6cdb490ac9fe7102da434278a':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:04:29 -07:00
Mike Lockwood
600bbc5667 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:02:58 -07:00
Mike Lockwood
dcc1d18101 am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:00:33 -07:00
Mike Lockwood
00aace4934 Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 2011-03-28 10:58:03 -07:00
David Li
7a52015696 GLES2Dbg: use 256KB chunks for lzf compression
Data format is uint32_t totalDecompressedSize, then repeat:
uint32_t chunkDecompressedSize, chunkCompressedSize, chunk data.
If chunkCompressedSize == 0, then chunk is not compressed.

Also start fixing integer sizes on server.
On client, set endianness to match server.

Change-Id: I0d5afa16976ea6019b91c4e21d284605da7e135e
Signed-off-by: David Li <davidxli@google.com>
2011-03-28 10:32:37 -07:00
Andreas Huber
c9832f271f am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:34:06 -07:00
Andreas Huber
0e4a59ea2c am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'e7cedad2b8408a13c610f3a7fcf13597a432a37d':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:26:21 -07:00
Brad Fitzpatrick
7dba70e98f am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-28 08:26:02 -07:00
Andreas Huber
9de7d2bb83 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:16:52 -07:00
Brad Fitzpatrick
587b9dc7b6 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
199f567fc7 Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 2011-03-28 08:13:08 -07:00
Andreas Huber
1689095fc5 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Brad Fitzpatrick
a57bf3d09b Merge "Unregister callback from binder when vibration is removed" 2011-03-28 07:59:08 -07:00
Wink Saville
c583ce5e90 am 238b5c4e: am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE
* commit '238b5c4e8470c51582ed53e3987626720ab4c013':
  Work around for operator not being correct.
2011-03-26 16:55:23 -07:00
Wink Saville
00671ec75a am 9c2c7ace: am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE
* commit '9c2c7ace9e5658cb2c16b6e720ac39ea349d5921':
  Add some debug to apn list creation routines.
2011-03-26 16:53:32 -07:00
Wink Saville
bf9c5db48a am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE
* commit '9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e':
  Work around for operator not being correct.
2011-03-26 16:52:53 -07:00
Wink Saville
b5bfa6fcbf am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE
* commit '3420f85cc65af8e3ec6c651667c8cffbac60ba4e':
  Add some debug to apn list creation routines.
2011-03-26 16:51:13 -07:00
Wink Saville
dd767313f9 Merge "Work around for operator not being correct." into honeycomb-LTE 2011-03-26 16:50:17 -07:00