1121 Commits

Author SHA1 Message Date
Urs Grob
bddae03fbd Merge branch 'readonly-p4-master' 2009-04-18 22:48:29 -07:00
Urs Grob
7d41b8c26a AI 146828: am: CL 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/...
  Original author: android-build

Automated import of CL 146828
2009-04-18 22:47:14 -07:00
Dave Sparks
89e2782d71 Merge branch 'readonly-p4-master' 2009-04-18 22:26:57 -07:00
Dave Sparks
32346a89c3 AI 146671: am: CL 146668 am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146671
2009-04-18 22:25:38 -07:00
Dave Sparks
ec9cacad76 Merge branch 'readonly-p4-master' 2009-04-18 22:21:29 -07:00
Dave Sparks
40a9d16087 AI 146658: am: CL 146655 am: CL 146654 Add java docs for SoundPool
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146658
2009-04-18 22:20:18 -07:00
Brandon Ballinger
cd63c7f89a Merge branch 'readonly-p4-master' 2009-04-18 22:05:19 -07:00
Brandon Ballinger
f1bb004cda AI 146615: am: CL 146613 Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Original author: brandonb

Automated import of CL 146615
2009-04-18 22:04:01 -07:00
Dirk Dougherty
fb56fcabda Merge branch 'readonly-p4-master' 2009-04-18 22:02:32 -07:00
Dirk Dougherty
9c3209db78 AI 146612: am: CL 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/...
  Original author: android-build

Automated import of CL 146612
2009-04-18 22:01:18 -07:00
Dirk Dougherty
7ead0f15e4 Merge branch 'readonly-p4-master' 2009-04-18 21:59:48 -07:00
Dirk Dougherty
e330115c30 AI 146604: am: CL 146602 am: CL 146601 Update media formats appendix for cupcake
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146604
2009-04-18 21:58:38 -07:00
Xavier Ducrohet
59bf504f5c Merge branch 'readonly-p4-master' 2009-04-18 21:43:30 -07:00
Xavier Ducrohet
ddcc5bca5e AI 146586: am: CL 146485 am: CL 146411 Fix BridgeCanvas#drawRoundRect
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146586
2009-04-18 21:42:17 -07:00
Dirk Dougherty
18b9eafd39 Merge branch 'readonly-p4-master' 2009-04-18 21:11:00 -07:00
Dirk Dougherty
d6f5a3ad1f AI 146573: am: CL 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/...
  Original author: android-build

Automated import of CL 146573
2009-04-18 21:09:48 -07:00
Dirk Dougherty
5a9b2a6a7e Merge branch 'readonly-p4-master' 2009-04-18 21:08:19 -07:00
Dirk Dougherty
3250756743 AI 146572: am: CL 146343 am: CL 146340 Integrate updated SDK Terms and Conditions document
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146572
2009-04-18 21:07:05 -07:00
Scott Main
ace8bd683d Merge branch 'readonly-p4-master' 2009-04-18 16:14:56 -07:00
Scott Main
74577f7cf8 AI 146557: am: CL 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/...
  Original author: android-build

Automated import of CL 146557
2009-04-18 16:13:35 -07:00
Scott Main
d854076c23 Merge branch 'readonly-p4-master' 2009-04-18 16:12:09 -07:00
Scott Main
d74e8fc336 AI 146556: am: CL 146251 am: CL 146242 fix the package namespace in the examples;
delete the old hello-android file
  Original author: smain
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146556
2009-04-18 16:10:56 -07:00
Guang Zhu
a1821e3fd1 Merge branch 'readonly-p4-master' 2009-04-18 15:58:39 -07:00
Guang Zhu
fde4a9e136 AI 146551: am: CL 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/...
  Original author: android-build

Automated import of CL 146551
2009-04-18 15:57:27 -07:00
Ramanan Rajeswaran
872b16bbca Merge branch 'readonly-p4-master' 2009-04-18 15:29:04 -07:00
Ramanan Rajeswaran
d73a32e726 AI 146539: am: CL 146145 am: CL 146144 Set default map location for Ireland and South Africa
Original author: ramanan
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146539
2009-04-18 15:27: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
62200dd153 AI 146754: Fix some problems in the SoundPool docs and add additional text.
BUG=1795461

Automated import of CL 146754
2009-04-17 11:29:35 -07:00
Jean-Michel Trivi
f69b61b496 AI 146751: Finalize AudioTrack javadoc.
BUG=1795799

Automated import of CL 146751
2009-04-17 11:22:35 -07:00
Android (Google) Code Review
cec478a162 Merge change 271
* changes:
  Manually merge 129, 174, and 233 from donut
2009-04-17 11:04:03 -07:00
Jack Palevich
1c4907ee77 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
7bec074f25 Merge change 164
* changes:
  Use lower case mime type, encoding, and transfer encoding.
2009-04-17 05:26:25 -07:00
Patrick Scott
2563ed8f70 Use lower case mime type, encoding, and transfer encoding. 2009-04-17 08:23:07 -04:00
Urs Grob
358d23017d AI 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
  BUG=1789657

Automated import of CL 146711
2009-04-17 02:09:00 -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