587 Commits

Author SHA1 Message Date
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
Scott Main
4d92847647 Merge branch 'readonly-p4-master' 2009-04-16 11:43:01 -07:00
Scott Main
40cfce418d AI 146507: am: CL 146029 am: CL 146028 update hello world tutorial for cupcake, including various other edits.
Original author: smain
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146507
2009-04-16 11:41:43 -07:00
Android (Google) Code Review
15ce2abd2d Merge changes 222,223,227
* changes:
  update onCreate method to work around InstrumentationTestRunner limitation.
  Removing unused StreamPipe class, also stripping some white spaces
  * Update the way that run_page_cycler.py detectes instrumentation failures. * Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
2009-04-16 11:12:33 -07:00
Android (Google) Code Review
0cee40e2bb Merge change 219
* changes:
  Fix a null pointer exception in DumpRenderTree (issue 1792567)
2009-04-16 11:11:14 -07:00
Robert Greenwalt
881b9cbb4f Merge branch 'readonly-p4-master' 2009-04-16 11:07:25 -07:00
Robert Greenwalt
a6872ae008 AI 146502: am: CL 145995 am: CL 145993 Fix Phone-oriented default-locale selection.
When several locales for a given language are available we were always
  selecting the first.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146502
2009-04-16 11:06:10 -07:00
Feng Qian
be42388bdb Fix a null pointer exception in DumpRenderTree (issue 1792567)
The first test causes NullPointerException in DumpRenderTree because dumpAsText
could return a null string.
2009-04-16 11:04:21 -07:00
Ramanan Rajeswaran
8ad51f93b5 Merge branch 'readonly-p4-master' 2009-04-16 10:49:44 -07:00
Ramanan Rajeswaran
d3d7817268 AI 146488: am: CL 145981 am: CL 145892 Add Ireland, Switzerland, New Zealand, South Africa to MccTable
Original author: ramanan
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146488
2009-04-16 10:47:33 -07:00
Guang Zhu
025950db01 update onCreate method to work around InstrumentationTestRunner limitation. 2009-04-16 10:41:27 -07:00
Guang Zhu
4722251d93 Removing unused StreamPipe class, also stripping some white spaces 2009-04-16 10:25:54 -07:00
Guang Zhu
23a4e88162 * Update the way that run_page_cycler.py detectes instrumentation failures.
* Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
2009-04-16 10:21:06 -07:00
Android (Google) Code Review
7a430cf152 Merge change 195
* changes:
  Make webkit's cursor draw at the correct times.
2009-04-16 06:21:10 -07:00
Leon Scroggins
63dda1c7b4 Make webkit's cursor draw at the correct times.
This change is dependent on another change to external/webkit.  Tell the WebViewCore to change its FocusController's "active" status depending upon whether the WebView has focus.  This fixes a bug where we were showing the blinking cursor when the WebView was not in focus.
2009-04-15 13:25:00 -04:00
Eric Shienbrood
bdacd87562 Merge branch 'readonly-p4-master' 2009-04-15 06:59:53 -07:00
Eric Shienbrood
674dfebd81 AI 146316: Get build working by fixing manual merge that I messed up.
Automated import of CL 146316
2009-04-15 06:58:36 -07:00
Eric Shienbrood
51b0c74d8d Merge branch 'readonly-p4-master' 2009-04-14 15:41:38 -07:00
Eric Shienbrood
2ecc74f330 AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
2009-04-14 15:40:20 -07:00
Yu Shan Emily Lau
b3c5b03055 Merge branch 'readonly-p4-master' 2009-04-14 14:33:23 -07:00
Yu Shan Emily Lau
810ec50a1e AI 146179: am: CL 145971 am: CL 145757 Suppress the flaky tests
Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146179
2009-04-14 14:32:03 -07:00
Dan Bornstein
649435a40f Merge branch 'readonly-p4-master' 2009-04-14 12:42:22 -07:00
Dan Bornstein
5a0e535782 AI 146178: am: CL 145970 am: CL 145743 Excise the "de" locale out of testResourceBundles(), leaving a
TODO and long comment about the situation.
  Original author: danfuzz
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146178
2009-04-14 12:41:05 -07:00
Brett Chabot
3071177a4a Merge branch 'readonly-p4-master' 2009-04-14 12:39:37 -07:00
Brett Chabot
23d1b4b21c AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest
Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146177
2009-04-14 12:38:22 -07:00
Lorenzo Colitti
cb1ac4f88f Merge branch 'readonly-p4-master' 2009-04-14 12:10:26 -07:00
Lorenzo Colitti
d86e6ddfc1 AI 146166: am: CL 145920 Don't filter out IPv6 multicast packets.
Original author: lorenzo

Automated import of CL 146166
2009-04-14 12:08:54 -07:00
Leon Scroggins
96c27559b0 Merge commit 'goog/master' 2009-04-14 12:06:19 -07:00
Android (Google) Code Review
894fa6cc14 Merge change 79
* changes:
  Squashed commit of the following:
2009-04-14 11:54:14 -07:00