Commit Graph

4609 Commits

Author SHA1 Message Date
David 'Digit' Turner
2b7aeaf077 am 186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread
* commit '186ce6d54380d2808acf341aec676f9c5ec56b63':
  NDK: Last cleanup of the platform headers
2010-11-04 04:11:19 -07:00
David 'Digit' Turner
186ce6d543 Merge "NDK: Last cleanup of the platform headers" into gingerbread 2010-11-04 04:09:48 -07:00
David 'Digit' Turner
f7b070255f am cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
* commit 'cc5809bf2fdae2ea7b5d84b21875cd2220c66105':
  ndk: Use __ANDROID__ instead of ANDROID.
2010-11-04 04:08:23 -07:00
David 'Digit' Turner
3c7c38b2bb NDK: Last cleanup of the platform headers
- fix a declaration omission in 3/<grp.h>
- add missing 8/<err.h>
- simplify 8/<stdio.h>
- update 9/ headers to the latest Bionic versions
- fix a typo in android_native_app_glue.h
- use __BEGIN_DECLS .. __END_DECLS whenever possible.
- remove C++-style comments from headers

Change-Id: I58b98b3973cde494436206194ba33416a11ca8ee
2010-11-04 04:07:16 -07:00
David 'Digit' Turner
cc5809bf2f Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread 2010-11-04 04:06:31 -07:00
Alexander Lucas
655f02a456 am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
* commit '48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
  Added SIP Demo to sample apps.
2010-11-03 15:35:24 -07:00
Alexander Lucas
48cc36d936 Merge "Added SIP Demo to sample apps." into gingerbread 2010-11-03 15:32:48 -07:00
Alexander Lucas
a025796211 Added SIP Demo to sample apps.
Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
2010-11-03 13:21:52 -07:00
Dirk Dougherty
9c92ae922c am 49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread
* commit '49fe761ddcf779f1913d22706a2a6153b80aa397':
  Cherry pick from master: Sample app and test package for a Service
2010-11-03 13:13:33 -07:00
Dirk Dougherty
49fe761ddc Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread 2010-11-03 13:12:11 -07:00
Roman Nurik
bf8c20f6f0 am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
* commit 'bccecc2b871749695148a7dcf27ff5b8655a77a0':
  Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
2010-11-03 07:56:40 -07:00
Roman Nurik
bccecc2b87 Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread 2010-11-03 07:55:06 -07:00
David Turner
dc4800e43b am fc187b1e: Merge "update native_window.h ndk header" into gingerbread
* commit 'fc187b1e3a73275dba91e98d912aa23d7b097fc9':
  update native_window.h ndk header
2010-11-02 01:51:44 -07:00
David Turner
fc187b1e3a Merge "update native_window.h ndk header" into gingerbread 2010-11-02 01:49:47 -07:00
David 'Digit' Turner
33d21904a4 am 10795d84: Declare localeconv() in <locale.h>
* commit '10795d840b0991fd6150475803610b125d4ea262':
  Declare localeconv() in <locale.h>
2010-11-02 01:43:46 -07:00
Mathias Agopian
3323f5912c update native_window.h ndk header
Change-Id: I70178a1ddd94279a102c2d25d2ce0459cec9d13a
2010-11-01 14:30:30 -07:00
David 'Digit' Turner
a99a3ff2b2 ndk: Use __ANDROID__ instead of ANDROID.
The platform headers use the ANDROID macro as a platform test.
This macro is set by the NDK build script explicitely, but it
is better to use __ANDROID__, which is also set by our toolchain
as a compiler prebuilt macro.

This allows usage of these headers with our standalone toolchain.

Change-Id: I431c54e29e502bb9da7a52ef7a58a6341211b4db
2010-10-30 20:41:23 -07:00
Glenn Kasten
cbb9f0d00e Remove .classpath and .project files
During review of the patch set for native audio sample, someone
mentioned there should not be these files in git.  But we seem to
be inconsistent about this (for example these files).  Can you
please let me know whether they should be there or not, and then I
will update the native audio patch set. Thanks!

Change-Id: I6d27f4936f8c60efb05a89a4ba11e77e66aaf539
2010-10-29 15:23:25 -07:00
David 'Digit' Turner
10795d840b Declare localeconv() in <locale.h>
The function is not implemented by our C library, but it is not
possible to build GNU libstdc++-v3 if the declaration is not part
of this header.

Change-Id: Iff6fa63465dde0d4e38c0f91709475bb35b31af9
2010-10-28 17:39:11 -07:00
Raphael Moll
07d29555ee am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:42:14 -07:00
Raphael Moll
4219799735 Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:32:23 -07:00
Roman Nurik
90c1d50252 Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
Change-Id: I4fa3b0aff4edfe80533066a81b0eacc97caa6f86
2010-10-26 14:04:11 -07:00
Mathias Agopian
c07ab4bd05 am 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread 2010-10-26 12:22:09 -07:00
Mathias Agopian
5a2fb6ce28 Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread 2010-10-26 12:18:49 -07:00
Jack Palevich
ddc73f98ca am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread 2010-10-26 10:27:09 -07:00
Jack Palevich
902b355dfc Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread 2010-10-26 10:25:13 -07:00
Mathias Agopian
844b1ed7c7 am f0c01122: simplify a bit the native-activity sample code 2010-10-26 07:24:45 -07:00
Mathias Agopian
793509c983 Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID.
This is the preferred way of selecting config starting in
gingerbread, this procedure guarantees forward compatibility.

Change-Id: Iff55b545e722205bd029b92da33368129253b8a3
2010-10-25 18:03:55 -07:00
Mathias Agopian
f0c011224a simplify a bit the native-activity sample code
there is no reason to set a depth buffer. this is somewhat confusing.
also, it's better to always specify EGL_SURFACE_TYPE.

Change-Id: Ieff499b0b69a3812773cf3fe08b8bf1ca57a82d9
2010-10-25 17:59:06 -07:00
Dianne Hackborn
4bd22f9401 am a77c1bdd: Work on issue #3126018: No way to specify NativeActivity\'s native method
Merge commit 'a77c1bdd4abf3c7e82af1f3b4330143d14c84103' into gingerbread-plus-aosp

* commit 'a77c1bdd4abf3c7e82af1f3b4330143d14c84103':
  Work on issue #3126018: No way to specify NativeActivity's native method
2010-10-25 17:07:35 -07:00
Dianne Hackborn
a77c1bdd4a Work on issue #3126018: No way to specify NativeActivity's native method
Update the header file to match the platform change.

Also add an Android.mk so I can actually build this sample when I want to.

Change-Id: I30c3c43fba7c233c59005d916888a46dc7049651
2010-10-25 17:01:49 -07:00
Raphael Moll
5c428f4a8d am 799754e1: Merge "Tools package was missing proguard.bat"
Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp

* commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44':
  Tools package was missing proguard.bat
2010-10-25 16:57:55 -07:00
Raphael Moll
799754e18b Merge "Tools package was missing proguard.bat" 2010-10-25 14:43:05 -07:00
Raphael Moll
f4320c6b14 SDK Windows: Package customized proguard.bat scripts.
Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.

Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
2010-10-25 14:41:16 -07:00
Jack Palevich
9ca6f2c057 Remove unused Grid object from LabelMaker.java class.
Also remove unnescessary "executable" bits from a documentation file.

Change-Id: I49bf8a6f0dabece62d16956b7e02c9a846bdd69b
2010-10-25 14:03:27 -07:00
Roman Nurik
affd0f8ec3 am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread
Merge commit '83c50ca740fabe25189601db90dc1f65ed4d2061' into gingerbread-plus-aosp

* commit '83c50ca740fabe25189601db90dc1f65ed4d2061':
  Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
2010-10-25 13:55:34 -07:00
Roman Nurik
83c50ca740 Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display." into gingerbread 2010-10-25 13:50:34 -07:00
Scott Main
ccbd8955c0 am 0c53c5b6: Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for ve
Merge commit '0c53c5b6f6b449ad7bca14ebb4d650913650b219' into gingerbread-plus-aosp

* commit '0c53c5b6f6b449ad7bca14ebb4d650913650b219':
  Do not merge.
2010-10-25 11:17:09 -07:00
Scott Main
0c53c5b6f6 Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options menu based on the 'selected' item (that's what a context menu is for). - include all drawables in the app, instead of using system resources." into gingerbread 2010-10-25 11:14:20 -07:00
Raphael Moll
b04a4f947c Tools package was missing proguard.bat
SDK Bug: 3126278

Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
2010-10-23 22:11:37 -07:00
Dianne Hackborn
742b1fbd8b am c2d70d2a: Update native headers/library to match current platform. 2010-10-22 12:11:19 -07:00
Roman Nurik
72dcdbbd09 Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
Change-Id: Ic7ccc324dfe4d46f3aeb5c7edafc7cc97a6fdc49
2010-10-22 11:30:57 -07:00
Dianne Hackborn
c2d70d2a98 Update native headers/library to match current platform.
Change-Id: I40ef2fa924881b9653fcddcd09c14455ac1ef37e
2010-10-21 21:09:47 -07:00
Joe Malin
94ce3f2088 Cherry pick from master: Sample app and test package for a Service 2010-10-21 14:20:11 -07:00
Scott Main
875234d940 Do not merge.
This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521
Revise NotePad application to use better practices such as
        - inflating menus from XML and supporting API Level 3 without the need
        for version qualifiers on resource directories.
        - to NOT include items in the options menu based on the 'selected' item
        (that's what a context menu is for).
        - include all drawables in the app, instead of using system resources.

        Add features:
        - the ability to edit the note title through the context menu
        - disable menu items in the editor based on menu groups
        - add a "save" button to the editor instead of assuming BACK functionality
        - and show the title of the current note in the activity title.
        - and probably others

Change-Id: I5e6fa5315308edf1a9447ecadd5b289127776bd0
2010-10-21 12:46:04 -07:00
Yu Shan Emily Lau
35ccee0b22 am 9bfa6f90: Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the s
Merge commit '9bfa6f90b8c56ed7404c0c07a70e27a9fbad3c23' into gingerbread-plus-aosp

* commit '9bfa6f90b8c56ed7404c0c07a70e27a9fbad3c23':
  1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash.
2010-10-20 14:06:56 -07:00
Yu Shan Emily Lau
9bfa6f90b8 Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the shell command input text <string>" into gingerbread 2010-10-20 14:04:52 -07:00
Scott Main
9b07277b92 am 0702c101: am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include
Merge commit '0702c101253807064c177cdbfca80391b1a26aea' into gingerbread-plus-aosp

* commit '0702c101253807064c177cdbfca80391b1a26aea':
  Do not merge.
2010-10-20 13:54:47 -07:00
Scott Main
0702c10125 am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options m
Merge commit '05523fb0b48280a5364908b00768ec71edb847a2' into gingerbread

* commit '05523fb0b48280a5364908b00768ec71edb847a2':
  Do not merge.
2010-10-20 10:18:00 -07:00
Yu Shan Emily Lau
e8b416049b 1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash.
2) Add a new option in the scripted monkey which can enter a string through the shell command input text <string>

Change-Id: Iab7478fdc594c07e5166091d29dc644e430e43cb
2010-10-19 22:04:33 -07:00