Commit Graph

11073 Commits

Author SHA1 Message Date
Android (Google) Code Review
ad1fa03e70 Merge change Ifea65fb9 into eclair-mr2
* changes:
  Move the emergency call button to the top-right when there's no SIM.
2009-12-08 07:59:34 -08:00
Jack Palevich
66089a33ea 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-08 15:43:51 +08:00
Trevor Johns
fee7c08d9f am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2

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

* commit '9c79938d47a3caa06e5fb956955374f30c55992b':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-07 19:38:01 -08:00
Dianne Hackborn
8c6cedc9bc Propagate background scheduling class across processes.
This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group.  Plus an API to turn this off for the process, which is
used by the system process.

This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
2009-12-07 19:11:14 -08:00
Vasu Nori
630aeaf871 am 976ed437: am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '976ed43786dcf078a0f802716d49644691656a24'

* commit '976ed43786dcf078a0f802716d49644691656a24':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 18:38:11 -08:00
Evan Millar
37f7dcb8b1 am 4adf8017: am b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit '4adf8017374c20f725400233fc7b039613c78caf'

* commit '4adf8017374c20f725400233fc7b039613c78caf':
  Add Sets#newSortedSet()
2009-12-07 18:37:57 -08:00
Andreas Huber
9bbfa00baa am 9659126d: am 247003be: Merge change I250f2433 into eclair-mr2
Merge commit '9659126db10f65b6e502b2175d34c75b301fb7e9'

* commit '9659126db10f65b6e502b2175d34c75b301fb7e9':
  Initial checkin of stagefright MP3 audio decoder based on PV source code.
2009-12-07 18:37:46 -08:00
Leon Scroggins
9d3288ffcb am 0092ee13: am 6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '0092ee13e4490bbd8de522d256fb4d7dab81be60'

* commit '0092ee13e4490bbd8de522d256fb4d7dab81be60':
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 18:37:16 -08:00
Grace Kloba
d513c2c278 am 8657978a: am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit '8657978aabc7141869926a98a0da257255678dd4'

* commit '8657978aabc7141869926a98a0da257255678dd4':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 18:37:00 -08:00
Grace Kloba
b1821a34fd am a49f91a2: am 14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit 'a49f91a2cb0cf39fa07d25ba896f5bf115b768e7'

* commit 'a49f91a2cb0cf39fa07d25ba896f5bf115b768e7':
  Add "res" support for WebView.
2009-12-07 18:36:32 -08:00
Dave Sparks
b6866aa8cd am 610e50cc: am 62679112: Merge change I3c256cf3 into eclair-mr2
Merge commit '610e50ccd2a342fbc75e3b30a2057dbca8fb92fd'

* commit '610e50ccd2a342fbc75e3b30a2057dbca8fb92fd':
  More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
2009-12-07 18:36:00 -08:00
Jason Sams
844b89a888 am 54f5ca41: am ffacbc34: am fd2f6358: Merge change I771bebb9 into eclair
Merge commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c'

* commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c':
  Add Java exceptions to catch RS calls with no context or no surface.
2009-12-07 18:35:48 -08:00
Daniel Sandler
e50d6db5bd am 0128c250: am 1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef'

* commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef':
  Allow room for descenders in am/pm text.
2009-12-07 18:35:36 -08:00
Dave Sparks
90b7fe15e1 am 5ac5cd73: am 9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2
Merge commit '5ac5cd7300fda7cb80ae0fb3d66594abd4f91939'

* commit '5ac5cd7300fda7cb80ae0fb3d66594abd4f91939':
  Remove unused Java object reference in native SoundPool code.
2009-12-07 18:35:23 -08:00
Eric Laurent
3ddac01576 am bf831e0d: am 38f6bdc4: am 0a08029f: Fix issue 2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65'

* commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65':
  Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.
2009-12-07 18:35:06 -08:00
Andreas Huber
d740563af7 am 2109e680: am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '2109e6801199b10460330027f3537d406b6a0149'

* commit '2109e6801199b10460330027f3537d406b6a0149':
  Fixing the build, only instantiate the software aac decoder in full stagefright builds.
2009-12-07 18:34:41 -08:00
Andreas Huber
b5772f8844 am 81a005d0: am 73abc2ea: Merge change I9c6e1f90 into eclair-mr2
Merge commit '81a005d070bec3a756f5caa48cdda25bcc732ce9'

* commit '81a005d070bec3a756f5caa48cdda25bcc732ce9':
  Initial check in of stagefright software AAC decoder based on PV source code.
2009-12-07 18:34:13 -08:00
Eric Laurent
6f39f3a3d2 am e30bae7f: am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5'

* commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 18:33:53 -08:00
Yu Shan Emily Lau
d140674173 am a3d15d3b: am 8e6d79e2: am 8445f367: Merge change Ibb9b1de1 into eclair
Merge commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23'

* commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23':
  1) Capture the start memory before the test started
2009-12-07 18:33:38 -08:00
Andreas Huber
f21b8e0f3d am f553a584: am 5921fb51: Merge change I91eb0354 into eclair-mr2
Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573'

* commit 'f553a58425c66a990dbc5f4579c976a0636fc573':
  Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
2009-12-07 18:32:57 -08:00
Leon Scroggins
52f4eec0d9 am 0b1a9f76: am 9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '0b1a9f7648a9e57b0eaf6766f73810de94136669'

* commit '0b1a9f7648a9e57b0eaf6766f73810de94136669':
  Show search icon for <input type="search"> fields.
2009-12-07 18:31:58 -08:00
Maryam Garrett
39b99a2f32 am 44e537a8: am 7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '44e537a859966378f1599db5e5d41045e78efd94'

* commit '44e537a859966378f1599db5e5d41045e78efd94':
  Improves the touch-based text selection UI in text boxes.
2009-12-07 18:31:35 -08:00
Dima Zavin
9a50db0468 am 0c15b889: am 401f4220: am 0019215f: Revert "When using MDP, we needed to use a texture for diming."
Merge commit '0c15b889317e9569282e4513db598369a0506b40'

* commit '0c15b889317e9569282e4513db598369a0506b40':
  Revert "When using MDP, we needed to use a texture for diming."
2009-12-07 18:30:40 -08:00
Carl Shapiro
c61d514ee1 Merge commit '6f93bf9e' into manualmerge 2009-12-07 17:54:11 -08:00
Mike Lockwood
d56352bddd am 7e90005f: Merge change I705b1d33 into eclair
Merge commit '7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-mr2

* commit '7e90005fcb95d4c20c92e915f4418b94341dda36':
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-07 17:22:54 -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
eb23b2c678 am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
2009-12-07 17:04:40 -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
88a86e8ae1 am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp

* commit 'b08170ad7e4ca4908852b0e20759ea740b338a03':
  Add API to get Active Sinks.
2009-12-07 15:57:28 -08:00
Jaikumar Ganesh
59746fefec am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2

* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
  Add API to get Active Sinks.
2009-12-07 15:53:02 -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
647b382a88 am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp

* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:36:25 -08:00
Jaikumar Ganesh
32cf6dc48e am 47cc8112: am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp

* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:36:19 -08:00
Robert Greenwalt
dd77d38bf2 am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:31:50 -08:00
Jaikumar Ganesh
297951f5ab am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2

* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:31:43 -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
Android (Google) Code Review
ec68a21530 Merge change I204e4787 into eclair
* changes:
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:27:02 -08:00
Kenny Root
92f5984d2c Optional use of UTF-8 strings in resource bundles
Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.

When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.

Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
2009-12-07 15:14:15 -08:00
Robert Greenwalt
1cde0c8403 am 096871e7: am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp

* commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
  Filter out minor Connectivity Notifications.
2009-12-07 15:13:51 -08:00
Robert Greenwalt
451a101c7c am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2

* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
  Filter out minor Connectivity Notifications.
2009-12-07 15:09:46 -08:00
Android (Google) Code Review
ac16968db1 Merge change I53e91db7 into eclair
* changes:
  Filter out minor Connectivity Notifications.
2009-12-07 15:04:52 -08:00
Bjorn Bringert
a4d13143f6 am 8d962613: am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '8d962613464b206f4c0b2323607c5e248543ad24'

* commit '8d962613464b206f4c0b2323607c5e248543ad24':
  Move android.server.search.SearchableInfo to android.app
2009-12-07 14:58:38 -08:00
Vasu Nori
d8f7aaf35c am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp

* commit '6be01bf207077ffbdcd3879250171a26ec805835':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:58:04 -08:00
Romain Guy
2c0b7dc4fd am 16c82c34: am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f'

* commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-07 14:56:53 -08:00
Doug Zongker
9a70d4aa30 am 0f91f870: am f6683bb5: Merge change I5f1d2d24 into eclair-mr2
Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61'

* commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61':
  move event log tags used by ActivityManager into this package
2009-12-07 14:56:30 -08:00
Kenny Root
e8aa94f51a am b145ad1d: am fc32a062: Merge change I88721afe into eclair-mr2
Merge commit 'b145ad1d32943745c1e712c2f4ecd01802d1f5dc'

* commit 'b145ad1d32943745c1e712c2f4ecd01802d1f5dc':
  Fix bitmask in aapt's StringPool length construction
2009-12-07 14:55:55 -08:00
Jack Palevich
9273f6d569 am 9196034b: am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '9196034b84c48844799a2904ef3ce31f18ee748e'

* commit '9196034b84c48844799a2904ef3ce31f18ee748e':
  Improve error message thrown when eglCreateContext fails.
  Improve error reporting by always returning the public
2009-12-07 14:55:39 -08:00
Romain Guy
b3139b352f am e300deaf: am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8'

* commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-07 14:55:23 -08:00
Andy McFadden
aa3a0ff7d4 am 19e0db20: am ebc910da: Merge change Iaad9c8d1 into eclair-mr2
Merge commit '19e0db20100753dd347ec5203cd0226f55f09e2a'

* commit '19e0db20100753dd347ec5203cd0226f55f09e2a':
  Restore 7.xml.
2009-12-07 14:55:04 -08:00