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.
* 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.
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
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.
TODO and long comment about the situation.
Original author: danfuzz
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146178
Frame.cpp:
Removed a line that should not be there anyway. Somehow when merging in Apple's ENABLE(TEXT_CARET) changes we left in a line that disables the blinking Cursor.
Platform.h:
Let WebKit draw the cursor.
RenderThemeAndroid.cpp:
Make the active selection color (the color of a selection in an active <textfield> or <textarea>) visible, and match the selection color shown in other places in Android.
WebViewCore.cpp:
Make the focused node's document's focus controller active. This allows webkit to draw the cursor.
TextDialog.java:
Set WillNotDraw to true, and remove our background, so that the TextDialog is completely invisible. Note that I have not changed its visibility to View.VISIBLE, which would have other undesired effects (would not accept touch events, for example). Since we are not drawing, remove onPreDraw, which is no longer necessary. In onSelectionChanged, pass a message to webkit telling it that the selection has changed. It is important that the two threads always agree (albeit webkit may be behind) because the user will now only see the selection drawn by webkit. Remove some old flawed code whose purpose was to keep the selection up to date and do not send key events for arrow keys (which would mess up the selection that was correct thanks to onSelectionChanged).
BUG=1781070,1712752,916193,1411370,1160999,1775425,1354814
Automated import of CL 146153
It should be renamed to something more meaninful before being exposed.
Original author: jsharkey
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146012
framework classes to deal with the new property. Also update various
documentation that mentions the default ringtones.
Use the build property as the default alert when the user has not chosen
an alert for an alarm. This is also used if the alarm alert is null when
the alarm fires.
BUG=1723684
Automated import of CL 145870
