Commit Graph

6236 Commits

Author SHA1 Message Date
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
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
Android (Google) Code Review
eb318fd88d Merge change I129483f8 into eclair-mr2
* changes:
  Optional use of UTF-8 strings in resource bundles
2009-12-08 13:41:38 -08:00
Android (Google) Code Review
ea3ec40a5d Merge change I96ddd6e2 into eclair-mr2
* changes:
  Migration to TrafficStats.
2009-12-08 12:41:51 -08:00
Android (Google) Code Review
ccc23cfef7 Merge change Ia28d9547 into eclair-mr2
* changes:
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-08 12:10:47 -08:00
Android (Google) Code Review
fc2b870ecf Merge change I237c1cee into eclair-mr2
* changes:
  Improve exception message thrown when a View's state is of the wrong type.
2009-12-08 11:32:50 -08:00
Android (Google) Code Review
4a5ba7dd4b Merge change I887f355f into eclair-mr2
* changes:
  Propagate background scheduling class across processes.
2009-12-08 11:25:48 -08:00
Android (Google) Code Review
b098b6dfef Merge change Ib16e5543 into eclair-mr2
* changes:
  Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
2009-12-08 09:16:08 -08:00
Android (Google) Code Review
8888279fe8 Merge change I8f658214 into eclair-mr2
* changes:
  Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
2009-12-08 09:16:00 -08:00
Android (Google) Code Review
8115899cfb Merge change Ic532c956 into eclair-mr2
* changes:
  Note to self: Don't reverse the arguments to fseek(o)...
2009-12-08 09:15:46 -08:00
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
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
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
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
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
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
Android (Google) Code Review
bd3b011489 Merge change Ifa1fae13 into eclair-mr2
* changes:
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:54:36 -08:00
Android (Google) Code Review
262e9cde09 Merge change Ie70845ca into eclair-mr2
* changes:
  Add Sets#newSortedSet()
2009-12-07 14:41:49 -08:00
Android (Google) Code Review
9cc07068bd Merge change I250f2433 into eclair-mr2
* changes:
  Initial checkin of stagefright MP3 audio decoder based on PV source code.
2009-12-07 14:31:46 -08:00
Android (Google) Code Review
78a0ab24ad Merge change Idff5eb2a into eclair-mr2
* changes:
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:39:22 -08:00
Android (Google) Code Review
997a5e52d7 Merge change I234162b0 into eclair-mr2
* changes:
  Add "res" support for WebView.
2009-12-07 13:05:46 -08:00
Android (Google) Code Review
ef5fcdff5e Merge change I3c256cf3 into eclair-mr2
* changes:
  More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
2009-12-07 13:02:56 -08:00