Commit Graph

125 Commits

Author SHA1 Message Date
Wu-cheng Li
81d763f77a Remove debug messages.
modified:   core/java/android/hardware/Camera.java

	modified:   camera/libcameraservice/CameraService.cpp
2009-04-22 16:22:01 +08:00
Android (Google) Code Review
35e5ee4e97 Merge change 387 into donut
* changes:
  Geocoder: Document behavior when no backend service is available.
2009-04-21 17:31:01 -07:00
Jeff Hamilton
6b225a92cc Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:14:41 -07:00
Android (Google) Code Review
5b0689a8b1 Merge change 372 into donut
* changes:
  WifiService: Cleanup parsing of wifi scan results.
2009-04-21 15:12:25 -07:00
Dirk Dougherty
2dc2e7197d Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:01:57 -07:00
Dirk Dougherty
915df02d41 Merge branch 'readonly-p4-donut' into donut 2009-04-21 14:55:49 -07:00
Scott Main
98c5a2daec Merge branch 'readonly-p4-donut' into donut 2009-04-21 14:28:13 -07:00
Dirk Dougherty
0bfa1bf0c6 Merge branch 'readonly-p4-donut' into donut 2009-04-21 14:15:40 -07:00
Android (Google) Code Review
e2ac5fddd8 Merge change 352 into donut
* changes:
  Remove dangling media recorder client reference when setCamera() is used.
2009-04-21 13:20:07 -07:00
Android (Google) Code Review
7e6a65edbb Merge change 368 into donut
* changes:
  location: Add some null pointer checks.
2009-04-21 12:44:57 -07:00
Andy Stadler
55cf040e52 Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:56:08 -07:00
Andy Stadler
09acf6e6c7 Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:53:07 -07:00
Android (Google) Code Review
3912875a1c Merge change 360 into donut
* changes:
  location: Location Manager wakelock cleanup, phase 1
2009-04-21 09:40:38 -07:00
Android (Google) Code Review
f22aa61a51 Merge change 336 into donut
* changes:
  Ensure ongoing progress updates after using the scroll ball to adjust position.
2009-04-21 08:18:50 -07:00
Dirk Dougherty
2d06d8af61 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:06:57 -07:00
Dirk Dougherty
2d8d226165 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:01:28 -07:00
James Dong
0ae13e36e1 Remove dangling media recorder client reference when setCamera() is used. 2009-04-20 19:35:28 -07:00
Jean-Michel Trivi
ecb28b3021 Merge branch 'readonly-p4-donut' into donut 2009-04-20 16:31:35 -07:00
Jean-Michel Trivi
f1542eacc0 Merge branch 'readonly-p4-donut' into donut 2009-04-20 10:47:31 -07:00
Dmitry Shmidt
2ad33d01a9 Merge branch 'readonly-p4-donut' into donut 2009-04-20 09:50:17 -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
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
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
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
Brandon Ballinger
db3095c118 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:33:04 -07:00
Dirk Dougherty
1ce38018f9 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:29:31 -07:00
Dirk Dougherty
73bca2e954 Merge branch 'readonly-p4-donut' into donut 2009-04-16 13:35:30 -07:00
Xavier Ducrohet
9a4ec0a034 Merge branch 'readonly-p4-donut' into donut 2009-04-16 12:45:54 -07:00
Android (Google) Code Review
753b1c74e9 Merge change 187 into donut
* changes:
  replaced integer * and % with shift operations, for performance
2009-04-16 00:05:57 -07:00
Android (Google) Code Review
f6a56f6813 Merge change 186 into donut
* changes:
  eliminate seemingly pointless conversion to and then from hex string
2009-04-15 12:13:07 -07:00
Dirk Dougherty
9a081ce2ca Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:35:03 -07:00
Dirk Dougherty
72362b79bc Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:32:07 -07:00
Android (Google) Code Review
f6aed0365c Merge change 190 into donut
* changes:
  location: Move geocoding support from ILocationProvider to a new interface.
2009-04-15 08:21:40 -07:00
Android (Google) Code Review
f32a863262 Merge change 174 into donut
* changes:
  Improve glgen
2009-04-15 06:14:11 -07:00
Android (Google) Code Review
65943af798 Merge change 175 into donut
* changes:
  telephony: Don't disable an APN type that is not enabled.
2009-04-14 20:19:42 -07:00
Jack Palevich
ffac1eff58 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.
2009-04-14 19:00:09 -07:00
Scott Main
5eb4852639 Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:23:06 -07:00
Scott Main
151414fed9 Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:02:10 -07:00
Guang Zhu
1c7ce8787d Merge branch 'readonly-p4-donut' into donut 2009-04-14 16:47:03 -07:00
Android (Google) Code Review
6f6fcc2afa Merge changes 108,130,131 into donut
* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
2009-04-14 14:40:02 -07:00
Android (Google) Code Review
3cc9a57fe9 Merge change 109 into donut
* changes:
  Remove references to android.util.Config
2009-04-14 14:39:51 -07:00
Android (Google) Code Review
4dc58eb1b7 Merge change 129 into donut
* changes:
  Clean up trivial Eclipse warnings and fix whitespace.
2009-04-14 14:15:22 -07:00
Android (Google) Code Review
aa913f65ce Merge change 154 into donut
* changes:
  gps: Add support for bringing up a GSM data connection on demand for SUPL.
2009-04-14 13:36:33 -07:00