Commit Graph

4406 Commits

Author SHA1 Message Date
The Android Automerger
7fe0eab6d7 merge in gingerbread-release history after reset to gingerbread 2011-01-16 08:53:30 -08:00
Jaikumar Ganesh
1b6086207f Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread 2011-01-14 16:11:35 -08:00
Elliott Hughes
ed6b76c670 Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread 2011-01-14 14:19:03 -08:00
Jaikumar Ganesh
6314c20eeb Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
Also fix some bugs.
Bug: 3352266

Change-Id: Ie64cb243159b1f6eea5f268f02a1dd58970d1e22
2011-01-14 13:11:34 -08:00
The Android Automerger
8ebd97eaef merge in gingerbread-release history after reset to gingerbread 2011-01-14 07:48:39 -08:00
Jeff Hamilton
aad3a1b732 Add a sample for the NFC foreground dispatch APIs.
Change-Id: Iee532d53b4d9354977414b0302b386a940606ab3
2011-01-13 14:39:58 -06:00
The Android Automerger
cd4e525cfb merge in gingerbread-release history after reset to gingerbread 2011-01-13 07:48:14 -08:00
The Android Automerger
12fd18451c merge in gingerbread-release history after reset to gingerbread 2011-01-12 07:20:55 -08:00
Elliott Hughes
c8887c191a Minor doc fixes (mainly the infamous "repo init-u").
Bug: http://code.google.com/p/android/issues/detail?id=8769
Change-Id: I6924baf82cc6939ba51e0b01af1f5f3c56106a5d
2011-01-11 18:10:17 -08:00
The Android Automerger
9ae5477a16 merge in gingerbread-release history after reset to gingerbread 2011-01-11 07:34:42 -08:00
Scott Main
ac96a5607d Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread 2011-01-10 13:33:08 -08:00
The Android Automerger
564e51a686 merge in gingerbread-release history after reset to gingerbread 2011-01-10 07:39:38 -08:00
Raphael
f823ebad02 Switch GB SDK to 2.4 / API 10. Do not merge.
Change-Id: I8e3c97c5c281b05e2e03b6739221ea8b13536bd3
2011-01-07 16:08:05 -08:00
Xavier Ducrohet
daf0b895e8 Cherry-pick f0e5e933 from master.
Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785
2011-01-07 13:03:22 -08:00
Raphael
89ee8c72f3 Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread 2011-01-07 01:22:18 -08:00
The Android Automerger
f6334ca5ce merge in gingerbread-release history after reset to gingerbread 2011-01-06 17:24:14 -08:00
Eric Fischer
01f0846415 Import translations for additional languages.
Change-Id: I763f3be3ac076d68b6253b31963a9f476e2004a8
2011-01-06 10:27:56 -08:00
David 'Digit' Turner
cbc7f69548 ndk: Replace 'asm' with '__asm__' in <asm/byteorder.h>
See https://review.source.android.com/#change,20076 for details.
Essentially this is to allow compilation with -std=c99

Change-Id: I4c830c38b2615352765ee40773c5aa701e5d2b68
2011-01-05 23:08:29 +01:00
The Android Automerger
8f2917d269 merge in gingerbread-release history after reset to gingerbread 2011-01-05 07:33:53 -08:00
The Android Automerger
7a6d8e2252 merge in gingerbread-release history after reset to gingerbread 2011-01-04 07:19:38 -08:00
Raphael
46994f5d93 SDK for 2.3.1 -- DO NOT MERGE
Change-Id: I2be72f53a6fe2d2bc1371f57439a4c5da972dcbb
2010-12-23 14:20:30 -08:00
The Android Automerger
b10673eed8 merge in gingerbread-release history after reset to gingerbread 2010-12-22 08:00:37 -08:00
The Android Automerger
2ac74d8c9e merge in gingerbread-release history after reset to gingerbread 2010-12-21 08:31:37 -08:00
Scott Main
9efea49e40 cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d
docs: fix broken links in sample docs

Change-Id: Icbc2c16b9f4caee25ab2265ea5425c57f0989ab1
2010-12-15 11:45:24 -08:00
David 'Digit' Turner
9ddaf219fa Add missing declarations to <netinet/in.h>
These are required to properly build the Boost libraries with the
Android NDK.

Change-Id: Ice272f24b359ffce19838f5500641c4fcda8e57f
2010-12-14 14:42:52 +01:00
David 'Digit' Turner
90887627f1 ndk: Update headers and libraries for API level 9
Change-Id: I39eded0065145803b51b22cdc18abef43abe426c
2010-12-10 17:16:24 +01:00
Mathias Agopian
cec3f598e6 Merge "Add an API demo showcasing the new rotation vector sensor" into gingerbread 2010-11-30 14:05:20 -08:00
Dirk Dougherty
4171f29668 Add AcceleromerPlay sample app to SDK samples package
Change-Id: Id7ae8de4f3543169d6d707a470f0b872e00e953f
2010-11-29 18:11:26 -08:00
Dirk Dougherty
c73f37ba57 Remove HeavyWeight sample from SDK samples package.
Change-Id: Id2113b8a0cd1a7cc3d807919e6c40c50917baaea
2010-11-29 17:03:46 -08:00
Roman Nurik
14789d1eab Merge "Add NFCDemo to sdk.atree" into gingerbread 2010-11-29 15:52:21 -08:00
Roman Nurik
9488e4296e Add NFCDemo to sdk.atree
Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403
2010-11-29 15:45:50 -08:00
Scott Main
b24dbcefc4 update notepad menu icons with new styles for GB (20% smaller)
Change-Id: Ie5b9e42d56688558e9e3220bb15729d5142775ba
2010-11-29 11:56:03 -08:00
Anirudh Dewani
dbe66332e2 Extended camera preview to switch between multiple available device cameras
Change-Id: I8e97d6182bf02cba29ae3bc9f1a7ef21a277117e
2010-11-26 02:28:11 +05:30
Mathias Agopian
d6e9c61294 Add an API demo showcasing the new rotation vector sensor
Change-Id: I3f00560b0340db31779259aa98efc174b0b645cd
2010-11-24 13:53:57 -08:00
David 'Digit' Turner
1e7011fcd5 ndk: Add auto-generated <android/api-level.h>
See ndk.git/build/tools/dev-generate-api-levels.sh

Change-Id: Id64e565e7da6bf23f4bfa0fca52a06dbfe843c37
2010-11-22 22:38:57 +01:00
The Android Automerger
fb261ca9bd Merge branch 'gingerbread' into gingerbread-release 2010-11-15 17:24:06 -08:00
Glenn Kasten
f328f262fd Merge "Remove .classpath and .project files" into gingerbread 2010-11-15 16:23:34 -08:00
Megha Joshi
7f39ff802b Merge "NFC sample app (DO NOT MERGE)" into gingerbread 2010-11-12 18:30:14 -08:00
Megha Joshi
150dd1693f NFC sample app (DO NOT MERGE)
Change-Id: I1d1d67bbc6760cea1a0c6eccfa4d9f7b1398cd4d
2010-11-12 18:03:05 -08:00
The Android Automerger
076c773809 Merge branch 'gingerbread' into gingerbread-release 2010-11-10 09:25:09 -08:00
The Android Automerger
49009ec768 Merge branch 'gingerbread' into gingerbread-release 2010-11-05 18:29:50 -07:00
Glenn Kasten
809ec924d2 Native audio example
Change-Id: Ia48597d3e94d178ec95a396c545e4a95de7c88f8
2010-11-05 17:38:11 -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
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
The Android Automerger
52b4acd211 Merge branch 'gingerbread' into gingerbread-release 2010-11-04 00:04:04 -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
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
bccecc2b87 Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread 2010-11-03 07:55:06 -07:00