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
b7ba9ee6cc
am bf8c20f6: am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
...
* commit 'bf8c20f6f0ee32f7ca7bfb2fb5d932f13cab55ee':
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
2010-11-03 12:02:21 -07:00
David Turner
3885c649aa
am dc4800e4: am fc187b1e: Merge "update native_window.h ndk header" into gingerbread
...
* commit 'dc4800e43b063ebe8994827f5dea58206a503efd':
update native_window.h ndk header
2010-11-03 08:31:15 -07:00
David 'Digit' Turner
7e73103bb8
am 33d21904: am 10795d84: Declare localeconv() in <locale.h>
...
* commit '33d21904a4677f10aa651abb39d0c7c9308e104b':
Declare localeconv() in <locale.h>
2010-11-03 08:31:09 -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
Chet Haase
ed20aff7b1
Added setColor to ColorDrawable.
...
Also, set hardwareAccelerated=false for animation demos using ovals
(which are not yet supported through GL)
Change-Id: I710b6be51a14bf02650206bd6bae8841ecd3ac79
2010-11-01 13:54:29 -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
Dianne Hackborn
6d36a9ee9b
New API demo showing different soft input modes.
...
Change-Id: I2aa53a093df0bd11d9bbe9eb866d2309f113d96d
2010-10-29 17:24:41 -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
Adam Powell
6a89a9ead0
Added demo for ActionBar display options
...
Change-Id: Ib916c36c0d3f8866b4f7f3a616fe15dcf0ca007f
2010-10-29 15:10:57 -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
Dianne Hackborn
c5b44be024
Fix issue #3083745 : ApiDemos CustomTitle crashes
...
Also turn on graphics acceleration in API demos... this will cause a
bunch of other stuff to crash until we go through and turn it off
where needed.
Change-Id: I9ddd2beadd19fdab170e5a8cf8beea6b0bc2156d
2010-10-28 10:52:11 -07:00
Raphael Moll
01cd2b97eb
am 07d29555: am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts."
2010-10-26 15:44:23 -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
Dianne Hackborn
1468e18a84
Merge "Update to follow API."
2010-10-26 15:25:34 -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
Dianne Hackborn
b252273014
Update to follow API.
...
Also a new list demo.
Change-Id: I0c59fc6f50009fcba183f0b5af61ec50d5888240
2010-10-26 12:47:13 -07:00
Mathias Agopian
ecdca8ecce
am c07ab4bd: am 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread
2010-10-26 12:23:56 -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
ca04e3adec
am ddc73f98: am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread
2010-10-26 10:31:43 -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
2cf5a578c6
am 844b1ed7: am f0c01122: simplify a bit the native-activity sample code
2010-10-26 07:28:47 -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
50fc9364b6
am 4bd22f94: am a77c1bdd: Work on issue #3126018 : No way to specify NativeActivity\'s native method
...
Merge commit '4bd22f94015a9ea90013a96270dc886f73207793'
* commit '4bd22f94015a9ea90013a96270dc886f73207793':
Work on issue #3126018 : No way to specify NativeActivity's native method
2010-10-25 17:25:14 -07:00
Raphael Moll
da1248a231
am 5c428f4a: am 799754e1: Merge "Tools package was missing proguard.bat"
...
Merge commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7'
* commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7':
Tools package was missing proguard.bat
2010-10-25 17:25:08 -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
a10cf9edd8
am affd0f8e: 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 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe'
* commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe':
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 14:00:28 -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
bfb2c1dbd0
am ccbd8955: (-s ours) 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
...
Merge commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561'
* commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561':
Do not merge.
2010-10-25 11:27:22 -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
Joe Malin
f290a6b611
Merge "Samples: Fix bugs in Note Pad sample app."
2010-10-24 11:11:52 -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
c8f1ba9bb0
am 742b1fbd: am c2d70d2a: Update native headers/library to match current platform.
2010-10-22 12:30:44 -07:00