Dirk Dougherty
abdc514bf3
Merge branch 'readonly-p4-donut' into donut
2009-04-21 01:01:28 -07:00
Dirk Dougherty
e90232b1da
AI 147054: am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
...
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147054
2009-04-21 01:00:12 -07:00
Jean-Michel Trivi
a0c9e8526b
Merge branch 'readonly-p4-donut' into donut
2009-04-20 16:31:35 -07:00
Jean-Michel Trivi
6fb5a1d0ee
AI 147035: am: CL 147032 Finalize JetPlayer javadoc.
...
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 147035
2009-04-20 16:30:18 -07:00
Jean-Michel Trivi
74338867aa
Merge branch 'readonly-p4-donut' into donut
2009-04-20 10:47:31 -07:00
Jean-Michel Trivi
ea63a41d26
AI 146938: am: CL 146937 Finalize AudioRecord javadoc.
...
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 146938
2009-04-20 10:45:23 -07:00
Dmitry Shmidt
6d31eb8953
Merge branch 'readonly-p4-donut' into donut
2009-04-20 09:50:17 -07:00
Dmitry Shmidt
42554c10b6
AI 146934: Make TI Wifi driver choice framework-independent - part 1
...
BUG=1786365
Automated import of CL 146934
2009-04-20 09:48:54 -07:00
Evan Millar
4482d8c8e4
Merge branch 'readonly-p4-donut' into donut
2009-04-18 12:27:51 -07:00
Evan Millar
c64edde69d
AI 146853: Add kernel wakelock data to batteryinfo dump.
...
BUG=1755458
Automated import of CL 146853
2009-04-18 12:26:32 -07:00
Android (Google) Code Review
9a1626146a
Merge change 287 into donut
...
* changes:
Get Sketch compiling.
2009-04-17 16:24:12 -07:00
Joe Onorato
8307a0c69c
Get Sketch compiling.
...
Add an Android.mk.
Android compiles with Java5, which doesn't let you put @Override on
interface methods.
2009-04-17 16:22:32 -07:00
Mike Lockwood
98cb667974
More Location Manager cleanup:
...
Move LocationCollector support out of GpsLocationProvider.
Don't disable GPS when screen is off.
Signed-off-by: Mike Lockwood <lockwood@android.com >
2009-04-17 18:06:18 -04:00
Android (Google) Code Review
981980e5da
Merge change 279 into donut
...
* changes:
Add sketch gesture demo application.
2009-04-17 14:20:38 -07:00
Joe Onorato
6e93a3db56
Add sketch gesture demo application.
...
Initial checkin, there's no Android.mk yet.
2009-04-17 14:18:46 -07:00
Android (Google) Code Review
27c6109aa8
Merge change 263 into donut
...
* changes:
location: Generalize support for location provider usage tracking.
2009-04-17 14:05:57 -07:00
Mike Lockwood
2f82c4eb0b
location: Generalize support for location provider usage tracking.
...
This replaces two different mechanisms that were used for GPS and Netork
location provider tracking.
Move BatteryStats logging of GPS usage from LocationManagerService to
GpsLocationProvider.
Clean up tracking of location listeners in LocationManagerService and remove
some HashMaps that are no longer needed.
Signed-off-by: Mike Lockwood <lockwood@android.com >
2009-04-17 17:00:32 -04:00
Dave Sparks
6440e81454
Merge branch 'readonly-p4-donut' into donut
2009-04-17 11:49:44 -07:00
Dave Sparks
6cb9900e6f
AI 146755: am: CL 146754 Fix some problems in the SoundPool docs and add additional text.
...
Original author: davidsparks
Merged from: //branches/cupcake/...
Automated import of CL 146755
2009-04-17 11:48:25 -07:00
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