Commit Graph

11566 Commits

Author SHA1 Message Date
Derek Sollenberger
0632e47c18 am 51ef573a: Switching from activity based full screen plugins to a view system overlay.
Merge commit '51ef573a8336c637ac508c49b84b512d8f11fa3a' into eclair-mr2-plus-aosp

* commit '51ef573a8336c637ac508c49b84b512d8f11fa3a':
  Switching from activity based full screen plugins to a view system overlay.
2009-12-09 15:44:30 -08:00
Trevor Johns
4ddc7fa4f7 am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp

* commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad':
  Updating list of standard Intents in android.content.Intent
2009-12-09 15:43:13 -08:00
Wu-cheng Li
64a44325ae am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp

* commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-09 15:42:20 -08:00
Dianne Hackborn
a58fb2aedc am 0766b2d0: Update service example code.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp

* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
  Update service example code.
2009-12-09 15:41:30 -08:00
Mike Lockwood
f32ddc84ec am 259e3384: am 7e90005f: Merge change I705b1d33 into eclair
Merge commit '259e3384face72ea8e30696d7bae492d37d44e8b' into eclair-mr2-plus-aosp

* commit '259e3384face72ea8e30696d7bae492d37d44e8b':
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-09 15:40:44 -08:00
Fred Quintana
ce56c32969 am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp

* commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99':
  remove an old STOPSHIP comment
2009-12-09 15:40:06 -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
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
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
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
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
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
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
bf285c4128 Merge change Ibe6eac82
* changes:
  Implement Matrix Palette extension.
2009-12-08 20:13:44 -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
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
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
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
Jaikumar Ganesh
b4d73d72bd am dbdabca7: am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4'

* commit 'dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4':
  Add API to get Active Sinks.
2009-12-08 14:50:43 -08:00
Robert Greenwalt
673a908609 am dbf68aa3: (-s ours) am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit 'dbf68aa372078f4f55a267e1eb182dd360384467'

* commit 'dbf68aa372078f4f55a267e1eb182dd360384467':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-08 14:50:31 -08:00
Jaikumar Ganesh
cd8a1138e4 am 1fbc280d: am 47cc8112: am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '1fbc280dac0ce5089ff1491612944344af8d72b4'

* commit '1fbc280dac0ce5089ff1491612944344af8d72b4':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-08 14:50:15 -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
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
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
Robert Greenwalt
ae253c57b0 resolved conflicts for merge of 47a2573e to master 2009-12-08 13:30:56 -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