Commit Graph

2505 Commits

Author SHA1 Message Date
Dirk Dougherty
2d8d226165 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:01:28 -07:00
Dirk Dougherty
2da23a2ab2 Merge branch 'readonly-p4-master' 2009-04-20 21:58:07 -07:00
James Dong
0ae13e36e1 Remove dangling media recorder client reference when setCamera() is used. 2009-04-20 19:35:28 -07:00
Android (Google) Code Review
4473649451 Merge change 339
* changes:
  adding concept of features to accounts
2009-04-20 18:21:44 -07:00
Dirk Dougherty
e9b75aad41 Merge branch 'readonly-p4-master' 2009-04-20 17:58:05 -07:00
Android (Google) Code Review
1739a1f600 Merge change 326
* changes:
  modify wait mechanism so that it checks whether activity has already finished or not first
2009-04-20 16:54:55 -07:00
Jean-Michel Trivi
4f5ecb5b29 Merge branch 'readonly-p4-master' 2009-04-20 16:33:36 -07:00
Jean-Michel Trivi
ecb28b3021 Merge branch 'readonly-p4-donut' into donut 2009-04-20 16:31:35 -07:00
Marco Nelissen
afc2553342 Merge branch 'readonly-p4-master' 2009-04-20 16:17:25 -07:00
Marco Nelissen
4ab7abd796 Merge branch 'readonly-p4-master' 2009-04-20 12:49:56 -07:00
Marco Nelissen
760b67af39 AI 146964: tabs -> spaces
Automated import of CL 146964
2009-04-20 12:48:39 -07:00
Jean-Michel Trivi
adbb2fa003 Merge branch 'readonly-p4-master' 2009-04-20 10:48:16 -07:00
Jean-Michel Trivi
f1542eacc0 Merge branch 'readonly-p4-donut' into donut 2009-04-20 10:47:31 -07:00
Android (Google) Code Review
0cd2f4c878 Merge change 261
* changes:
  Enable Application Caches.
2009-04-20 10:04:34 -07:00
Dmitry Shmidt
d7d33c36b0 Merge branch 'readonly-p4-master' 2009-04-20 09:54:14 -07:00
Dmitry Shmidt
2ad33d01a9 Merge branch 'readonly-p4-donut' into donut 2009-04-20 09:50:17 -07:00
Evan Millar
9a110fee1c Merge branch 'readonly-p4-master' 2009-04-18 23:36:20 -07:00
Dave Sparks
8eadf141f6 Merge branch 'readonly-p4-master' 2009-04-18 23:02:23 -07:00
Jean-Michel Trivi
c732d9df1d Merge branch 'readonly-p4-master' 2009-04-18 22:59:37 -07:00
Urs Grob
ea5ee32872 Merge branch 'readonly-p4-master' 2009-04-18 22:48:29 -07:00
Dave Sparks
dc46d966d6 Merge branch 'readonly-p4-master' 2009-04-18 22:26:57 -07:00
Dave Sparks
51925b69e3 Merge branch 'readonly-p4-master' 2009-04-18 22:21:29 -07:00
Brandon Ballinger
7b59cf703a Merge branch 'readonly-p4-master' 2009-04-18 22:05:19 -07:00
Dirk Dougherty
1d11e2671c Merge branch 'readonly-p4-master' 2009-04-18 22:02:32 -07:00
Dirk Dougherty
67f56a11af Merge branch 'readonly-p4-master' 2009-04-18 21:59:48 -07:00
Xavier Ducrohet
aea732c8d6 Merge branch 'readonly-p4-master' 2009-04-18 21:43:30 -07:00
Dirk Dougherty
ec199f6634 Merge branch 'readonly-p4-master' 2009-04-18 21:11:00 -07:00
Dirk Dougherty
cbf8225789 Merge branch 'readonly-p4-master' 2009-04-18 21:08:19 -07:00
Scott Main
ac08d9c38b Merge branch 'readonly-p4-master' 2009-04-18 16:14:56 -07:00
Scott Main
4bb4aab510 Merge branch 'readonly-p4-master' 2009-04-18 16:12:09 -07:00
Guang Zhu
d0604d37af Merge branch 'readonly-p4-master' 2009-04-18 15:58:39 -07:00
Ramanan Rajeswaran
53d361410d Merge branch 'readonly-p4-master' 2009-04-18 15:29:04 -07:00
Evan Millar
287657b079 Merge branch 'readonly-p4-donut' into donut 2009-04-18 12:27:51 -07:00
Android (Google) Code Review
3e8a53e769 Merge change 287 into donut
* changes:
  Get Sketch compiling.
2009-04-17 16:24:12 -07:00
Android (Google) Code Review
9b187e977a Merge change 279 into donut
* changes:
  Add sketch gesture demo application.
2009-04-17 14:20:38 -07:00
Android (Google) Code Review
4573f5982d Merge change 263 into donut
* changes:
  location: Generalize support for location provider usage tracking.
2009-04-17 14:05:57 -07:00
Mathias Agopian
34dd2d1c2d Merge commit 'goog/master' into merge_master 2009-04-17 13:11:48 -07:00
Dave Sparks
b083de35b8 Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:49:44 -07:00
Jean-Michel Trivi
823b984ed9 Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:46:50 -07:00
Urs Grob
14bbab5616 Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:31:36 -07:00
Android (Google) Code Review
c5a8dd2f82 Merge change 271
* changes:
  Manually merge 129, 174, and 233 from donut
2009-04-17 11:04:03 -07:00
Jack Palevich
412f38f270 Manually merge 129, 174, and 233 from donut
This adds a static OpenGL ES API.

Here are the three commit messages for the original changes:

Clean up trivial Eclipse warnings and fix whitespace.

Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.

This is the 2nd commit message:

Improve glgen

+ gen script is really a bash script rather than a sh script,
  so declare that to be true. (For example, it uses pushd,
  which is a part of bash, but not a part of sh. Not sure
  how this worked until now. Possibly gen was only run in
  environments where /bin/sh was really bash.

+ Check the results of the java compile of the code generator,
  and abort the script if the compile fails.

+ Turn on the bash shell option that guards against using
  uninitialized variables in the script.

+ Remove the generated class files.

Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.

This is the 3rd commit message:

Add an Android-specific static OpenGL ES 1.1 Java API.

This change adds four new public classes that expose a static OpenGL ES 1.1 API:

	android.opengl.GLES10
	android.opengl.GLES10Ext
	android.opengl.GLES11
	android.opengl.GLES11Ext

Benefits:

 + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
 + The static API is similar to the C API, which should make it easier to import C-based
   example code.
 + The static API provides a clear path for adding new OpenGL ES 1.1 extensions
   and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

  import static android.opengl.GLES10.*;

  ...

  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-17 10:32:56 -07:00
Android (Google) Code Review
f8c4464414 Merge change 164
* changes:
  Use lower case mime type, encoding, and transfer encoding.
2009-04-17 05:26:25 -07:00
Mathias Agopian
18d8446fe1 cleanup, remove unused fields. Also make sure that we don't systematically allocate a Surface in Surface.java if only a SurfaceControl is needed (Common case). 2009-04-16 20:30:22 -07:00
Mathias Agopian
01b766839e more splitting of Surface/SurfaceControl. Surface.java is now implemented in terms of Surface and SurfaceControl.
The WindowManager side of Surface.java holds a SurfaceControl, while the client-side holds a Surface. When the client is in the system process, Surface.java holds both (which is a problem we'll try to fix later).
2009-04-16 20:04:08 -07:00
Dave Sparks
0eb6d6e33d Merge branch 'readonly-p4-donut' into donut 2009-04-16 19:55:31 -07:00
Android (Google) Code Review
cb19163660 Merge change 233 into donut
* changes:
  Add an Android-specific static OpenGL ES 1.1 Java API.
2009-04-16 17:55:44 -07:00
Dave Sparks
658c6a1347 Merge branch 'readonly-p4-donut' into donut 2009-04-16 17:51:48 -07:00
Mathias Agopian
62185b7335 split Surface.cpp into Surface and SurfaceControl
SurfaceControl is used for controling the geometry of the surface (for the WM), while Surface is used to access the buffers (for SF's clients).
SurfaceFlingerClient now uses the SurfaceID instead of Surface*.

Currently Surface still has the SurfaceControl API and is implemented by calling into SurfaceControl.
2009-04-16 16:19:50 -07:00
Jack Palevich
427f585f72 Add an Android-specific static OpenGL ES 1.1 Java API.
This change adds four new public classes that expose a static OpenGL ES 1.1 API:

	android.opengl.GLES10
	android.opengl.GLES10Ext
	android.opengl.GLES11
	android.opengl.GLES11Ext

Benefits:

 + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
 + The static API is similar to the C API, which should make it easier to import C-based
   example code.
 + The static API provides a clear path for adding new OpenGL ES 1.1 extensions
   and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

  import static android.opengl.GLES10.*;

  ...

  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-16 15:20:55 -07:00