565 Commits

Author SHA1 Message Date
Marco Nelissen
d3af590f9c Merge branch 'readonly-p4-master' 2009-04-20 16:17:25 -07:00
Marco Nelissen
6a1fadea85 AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.
Automated import of CL 147028
2009-04-20 16:16:01 -07:00
Marco Nelissen
e7c71d3a8c Merge branch 'readonly-p4-master' 2009-04-20 12:49:56 -07:00
Marco Nelissen
e38e90bf22 AI 146964: tabs -> spaces
Automated import of CL 146964
2009-04-20 12:48:39 -07:00
Jean-Michel Trivi
e796cfaef8 Merge branch 'readonly-p4-master' 2009-04-20 10:48:16 -07:00
Jean-Michel Trivi
954bbe9fa3 AI 146941: am: CL 146938 am: CL 146937 Finalize AudioRecord javadoc.
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146941
2009-04-20 10:46:26 -07:00
Android (Google) Code Review
24a4320f9c Merge change 261
* changes:
  Enable Application Caches.
2009-04-20 10:04:34 -07:00
Dmitry Shmidt
c421e9ad74 Merge branch 'readonly-p4-master' 2009-04-20 09:54:14 -07:00
Dmitry Shmidt
69d27108e4 AI 146935: am: CL 146934 Make TI Wifi driver choice framework-independent - part 1
Original author: dimitrysh

Automated import of CL 146935
2009-04-20 09:52:56 -07:00
Andrei Popescu
60a9a7d055 Enable Application Caches. 2009-04-20 14:23:58 +01:00
Evan Millar
ac9fd3e423 Merge branch 'readonly-p4-master' 2009-04-18 23:36:20 -07:00
Evan Millar
74e258d63e AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
Original author: emillar

Automated import of CL 146854
2009-04-18 23:35:03 -07:00
Dave Sparks
094c065cbb Merge branch 'readonly-p4-master' 2009-04-18 23:02:23 -07:00
Dave Sparks
1bc5c2645d AI 146833: am: CL 146755 am: CL 146754 Fix some problems in the SoundPool docs and add additional text.
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146833
2009-04-18 23:01:09 -07:00
Jean-Michel Trivi
d4fd29e02c Merge branch 'readonly-p4-master' 2009-04-18 22:59:37 -07:00
Jean-Michel Trivi
3946a2b75b AI 146832: am: CL 146752 am: CL 146751 Finalize AudioTrack javadoc.
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146832
2009-04-18 22:58:18 -07:00
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
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
Ramanan Rajeswaran
4fd9a745d4 Merge branch 'readonly-p4-master' 2009-04-16 12:48:12 -07:00
Ramanan Rajeswaran
0862395395 AI 146536: am: CL 146129 am: CL 146127 Increase zoom level for NZ default maps location
Original author: ramanan
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146536
2009-04-16 12:46:47 -07:00
Ramanan Rajeswaran
5a9021e63e Merge branch 'readonly-p4-master' 2009-04-16 12:42:17 -07:00
Ramanan Rajeswaran
c8650817ef AI 146533: am: CL 146124 am: CL 146123 Change Belfast to Dublin
Original author: ramanan
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146533
2009-04-16 12:40:56 -07:00