Jean-Michel Trivi
b3eaa4a139
Merge branch 'readonly-p4-donut' into donut
2009-04-17 11:46:50 -07:00
Jean-Michel Trivi
ff14c25339
AI 146752: am: CL 146751 Finalize AudioTrack javadoc.
...
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 146752
2009-04-17 11:45:30 -07:00
Urs Grob
096840a2a0
Merge branch 'readonly-p4-donut' into donut
2009-04-17 11:31:36 -07:00
Urs Grob
da13ef5dca
AI 146743: am: CL 146711 Enhancing the test runner. Now it filters BrokenTests and only executes tests
...
annotated with SideEffect if the host is running in single test mode.
Also adding some cleanup mechanism and some logcat logging about memory consumption
Original author: ursg
Merged from: //branches/cupcake/...
Automated import of CL 146743
2009-04-17 11:30:14 -07:00
Dave Sparks
21b5817aaa
Merge branch 'readonly-p4-donut' into donut
2009-04-16 19:55:31 -07:00
Dave Sparks
2170312ab0
AI 146668: am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format
...
Original author: davidsparks
Merged from: //branches/cupcake/...
Automated import of CL 146668
2009-04-16 19:54:16 -07:00
Android (Google) Code Review
e8fbb001a4
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
1ebb286054
Merge branch 'readonly-p4-donut' into donut
2009-04-16 17:51:48 -07:00
Dave Sparks
cef302d095
AI 146655: am: CL 146654 Add java docs for SoundPool
...
Original author: davidsparks
Merged from: //branches/cupcake/...
Automated import of CL 146655
2009-04-16 17:50:27 -07:00
Jack Palevich
27f8002e59
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
3385e728d8
Merge branch 'readonly-p4-donut' into donut
2009-04-16 14:33:04 -07:00
Brandon Ballinger
181a44dd81
AI 146613: Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
...
Automated import of CL 146613
2009-04-16 14:31:48 -07:00
Dirk Dougherty
131e27a00c
Merge branch 'readonly-p4-donut' into donut
2009-04-16 14:29:31 -07:00
Dirk Dougherty
dc52312ce3
AI 146610: am: CL 146609 updates to the manifest docs for cupcake: Add "since" notations for elements and some attributes.
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146610
2009-04-16 14:28:14 -07:00
Dirk Dougherty
e6a9b45207
Merge branch 'readonly-p4-donut' into donut
2009-04-16 13:35:30 -07:00
Dirk Dougherty
cc6069eacf
AI 146602: am: CL 146601 Update media formats appendix for cupcake
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146602
2009-04-16 13:34:12 -07:00
Xavier Ducrohet
4edbf0758a
Merge branch 'readonly-p4-donut' into donut
2009-04-16 12:45:54 -07:00
Xavier Ducrohet
e30661294b
AI 146485: am: CL 146411 Fix BridgeCanvas#drawRoundRect
...
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 146485
2009-04-16 12:44:37 -07:00
Android (Google) Code Review
e2945e2d69
Merge change 187 into donut
...
* changes:
replaced integer * and % with shift operations, for performance
2009-04-16 00:05:57 -07:00
Tammo Spalink
e564b19ed2
replaced integer * and % with shift operations, for performance
2009-04-16 14:48:19 +08:00
Android (Google) Code Review
a6c6f06b07
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
7cf6fa727a
Merge branch 'readonly-p4-donut' into donut
2009-04-15 11:35:03 -07:00
Dirk Dougherty
2fd2f6e5c6
AI 146345: am: CL 146341 g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146345
2009-04-15 11:33:48 -07:00
Dirk Dougherty
e9a65c3a4a
Merge branch 'readonly-p4-donut' into donut
2009-04-15 11:32:07 -07:00
Dirk Dougherty
adb538b52f
AI 146343: am: CL 146340 Integrate updated SDK Terms and Conditions document
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146343
2009-04-15 11:30:46 -07:00
Android (Google) Code Review
f5bfda1fce
Merge change 190 into donut
...
* changes:
location: Move geocoding support from ILocationProvider to a new interface.
2009-04-15 08:21:40 -07:00
Mike Lockwood
a55c321329
location: Move geocoding support from ILocationProvider to a new interface.
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-15 11:17:37 -04:00
Android (Google) Code Review
a2180c6eee
Merge change 174 into donut
...
* changes:
Improve glgen
2009-04-15 06:14:11 -07:00
Tammo Spalink
e87e9506ba
eliminate seemingly pointless conversion to and then from hex string
2009-04-15 18:50:38 +08:00
Android (Google) Code Review
967f7c169c
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
Mike Lockwood
d90ff986b4
telephony: Don't disable an APN type that is not enabled.
...
Fixes a bad interaction between MMS and SUPL that occurs when they are using
the same APN.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-14 22:35:07 -04:00
Jack Palevich
4e70a9e462
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
c12801e1ed
Merge branch 'readonly-p4-donut' into donut
2009-04-14 17:23:06 -07:00
Scott Main
135d233540
AI 146255: am: CL 146254 clarification for the minSdkVersion attribute;
...
added more information to the <uses-sdk> reference,
added a link to it from the <manifes> reference, and
revised some misleading information in the android 1.1 version notes
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146255
2009-04-14 17:21:49 -07:00
Scott Main
fb9edfd165
Merge branch 'readonly-p4-donut' into donut
2009-04-14 17:02:10 -07:00
Scott Main
63c4120e33
AI 146251: am: CL 146242 fix the package namespace in the examples;
...
delete the old hello-android file
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146251
2009-04-14 17:00:51 -07:00
Guang Zhu
17b8ca48ab
Merge branch 'readonly-p4-donut' into donut
2009-04-14 16:47:03 -07:00
Guang Zhu
e6f63b1a15
AI 146246: am: CL 146225 Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early.
...
Original author: guangzhu
Merged from: //branches/cupcake/...
Automated import of CL 146246
2009-04-14 16:45:47 -07:00
Android (Google) Code Review
e2393c5792
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
4602d022ba
Merge change 109 into donut
...
* changes:
Remove references to android.util.Config
2009-04-14 14:39:51 -07:00
Android (Google) Code Review
2240eb8bcd
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
be2355988d
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
Mike Lockwood
58bda98766
gps: Add support for bringing up a GSM data connection on demand for SUPL.
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-14 16:25:07 -04:00
Android (Google) Code Review
b0d4a3502e
Merge change 133 into donut
...
* changes:
Initial code for cdma sms encode and decode, in java, with simple tests.
2009-04-14 13:20:43 -07:00
Android (Google) Code Review
f2aad4a468
Merge change 132 into donut
...
* changes:
Let's do bug #1769910 actually right.
2009-04-14 13:15:43 -07:00
Android (Google) Code Review
ab6f5c6e86
Merge change 142 into donut
...
* changes:
telephony: Add support for bringing up GSM data connections for GPS SUPL.
2009-04-14 12:52:28 -07:00
Mike Lockwood
42ad56ead4
telephony: Add support for bringing up GSM data connections for GPS SUPL.
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-14 14:58:29 -04:00
Ramanan Rajeswaran
407d69c826
Merge branch 'readonly-p4-donut' into donut
2009-04-14 11:07:13 -07:00
Ramanan Rajeswaran
c14b0f8295
AI 146145: am: CL 146144 Set default map location for Ireland and South Africa
...
Original author: ramanan
Merged from: //branches/cupcake/...
Automated import of CL 146145
2009-04-14 10:41:57 -07:00
Ramanan Rajeswaran
bd82eedf97
Merge branch 'readonly-p4-donut' into donut
2009-04-14 09:48:58 -07:00