Commit Graph

520 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
d294027b1f Merge 2fa7b9ff
Change-Id: I59b2fd09648909c721af5ebb951bc2287fe9fc1a
2012-04-18 15:04:52 -07:00
Jesse Hall
80d4ba7716 Move emulator GLES from development.git to sdk.git
The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.

Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.

Change-Id: Ie73fce12815c9740e27d0f56caa53c6ceb3d30cc
2012-04-18 06:26:17 -07:00
Jesse Hall
b62e28ddde Move emulator GLES from development.git to sdk.git
The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.

Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.

Change-Id: Ibe2cf8de13520aa3fcbaf72328a15ece261d7b86
2012-04-16 15:53:33 -07:00
Robert Ly
affcdfd7d8 adding media effects sample to sdk
Change-Id: I8fc55e1ac5409c0262bfda930e6db3d34ce6ae08
2012-04-16 10:48:24 -07:00
Adam Powell
e331666e3e Move AppNavigation samples around
Move AppNavigation to SupportAppNavigation - this one uses the support
lib navigation helpers.

Add AppNavigation as an implementation of the same sample using the
framework features in JB.

Change-Id: I59e0f2e3e11ccccc277b177aee87bd88da8eb2c6
2012-04-05 18:03:24 -07:00
Xavier Ducrohet
34f38a5cdd am 4db20997: am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
* commit '4db20997681bbb2c7a16e1c7d50b1a1901496144':
  Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:06:28 -07:00
Xavier Ducrohet
e3e74aa50e am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
* commit '2a57c79366dcdac42e330a8af752e44410556f31':
  Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:01:30 -07:00
Xavier Ducrohet
40525ef472 Move stuff from prebuilt to prebuilts/tools
Also move some atree copy to sdk.git where they belong.

Change-Id: Iab62343806917f24f47d15b9dea75e44422d8764
2012-04-03 16:33:35 -07:00
Raphael Moll
2edb02ab24 SDK: generate repo in xsd v6. DO NOT MERGE.
Requires change Ib6f5b03c and change I6ba33a96.

Change-Id: Ib42676359289e731d045c4a1e26c85fe5868d633
2012-04-02 15:21:41 -07:00
Tony Chan
8346f695d1 am d426fcd9: am a29f43f6: am 1a2ddb42: sdk doc change: Added KeyChain API Demo
* commit 'd426fcd9c2df2643b61c0627a41afbe453c9faf4':
  sdk doc change: Added KeyChain API Demo
2012-03-31 02:23:12 -07:00
Tony Chan
a29f43f6e1 am 1a2ddb42: sdk doc change: Added KeyChain API Demo
* commit '1a2ddb4216d81f9feadfea3a94bc9923255fe49a':
  sdk doc change: Added KeyChain API Demo
2012-03-31 02:17:44 -07:00
Tony Chan
1a2ddb4216 sdk doc change: Added KeyChain API Demo
Change-Id: Ib2b751a9de485359705b243d2c70e5f8f2c8ab3c
2012-03-30 11:10:01 +08:00
Andrew Hsieh
8d83be988a Fixed win_sdk build due to rs relocation
frameworks/base/libs/rs got promoted to its own git at frameworks/rs.
See https://android-git.corp.google.com/g/#/c/176760

Change-Id: I7ae8ed1df899eade42c77a85d2a63d012aa9fa13
2012-03-29 18:42:35 +08:00
Raphael Moll
75d9cabc8e resolved conflicts for merge of fe2da416 to stage-aosp-master
Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6
2012-03-28 11:05:45 -07:00
Raphael Moll
f413515f16 Merge SDK support for source.properties templates.
Requires build.git change Ib36928097

Change-Id: Ida0c471fe166a1388584f2cf2250e07040ed0e55
2012-03-27 11:59:06 -07:00
Raphael Moll
a85a93fdb0 SDK: correctly zip sources.zip package.
When building the sources.zip for the SDK Repository,
the --exec-zip argument seems to be have been lost with
recent merges. Without this flag, the sources.zip is
not valid on some platforms.

Change-Id: I589df3d6df7890e0fccf568a03a76e6985ecb534
2012-03-27 10:49:58 -07:00
Raphael Moll
fc188dcc3e am 9be260a2: am e7a1083b: am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '9be260a24746634cc66e223244d86da7a36bbe2b':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-24 10:27:24 -07:00
Raphael Moll
e7a1083bca am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '9c7b559fb730c57a522abb2956c0036edcd15e63':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-23 10:37:59 -07:00
Raphael Moll
9c7b559fb7 SDK source pkg: exclude all /tools/ and /tests/ directories.
Change-Id: Ia85105385280e21f073cef22e1130ad369bea121
2012-03-23 10:27:04 -07:00
Jean-Baptiste Queru
bbbc7e26be am 6c368d28: Merge "Fix build - configure for schema-v4 output"
* commit '6c368d28f57a45e8310fa0a8cdea240a42c2555e':
  Fix build - configure for schema-v4 output
2012-03-22 17:51:44 -07:00
Jean-Baptiste Queru
e35ac78cd4 Fix build - configure for schema-v4 output
Change-Id: I26b334e54b38cba49e84212fbe40250fb16dc738
2012-03-22 15:51:17 -07:00
Jean-Baptiste Queru
79977b408b am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."
* commit '8d2f79ba939e0394cf18489503a6f2a3ebcce8f6':
  SDK: generate repo using latest schemas when available.
2012-03-22 13:27:44 -07:00
Raphael Moll
8f7e1f7a95 SDK: generate repo using latest schemas when available.
This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
2012-03-21 19:08:11 -07:00
Raphael Moll
a4c2cb77b5 am af574136: Support lib: use /samples directory. do not merge.
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
2012-03-12 12:30:20 -07:00
Raphael Moll
af57413607 Support lib: use /samples directory. do not merge.
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

(Cherry-pick from 913d903aa2)

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
2012-03-12 12:27:02 -07:00
Raphael Moll
913d903aa2 Support lib: use /samples directory.
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
2012-03-12 11:33:18 -07:00
Ying Wang
06f3f54fc0 Add framework/native to fix build.
No framework/native is split out from framework/base.

Change-Id: I3b596a98feee01f433fa0e88d81d780315a3ebb8
2012-03-09 10:04:22 -08:00
Xavier Ducrohet
198705d1ab am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:07:38 -08:00
Xavier Ducrohet
92b3b05096 Add a prebuilt of the gridlayout support library. do not merge
Change-Id: Icd43238672a02f84e37d4301bec34dbe48375200
2012-03-07 17:47:12 -08:00
Raphael Moll
482423c8a9 Merge "SDK repo: fix to handle new and old xsd for support lib" 2012-03-07 15:04:14 -08:00
Xavier Ducrohet
7942a69488 Add the new v7 support library project to the SDK.
Change-Id: If9078f71e369bae3dd4a0e89ddd792bbfef09fbb
2012-03-06 15:14:05 -08:00
Raphael Moll
eb611a2c28 SDK repo: fix to handle new and old xsd for support lib
Change-Id: Ic6c42a416e115f5f15631d1a1149d2364fbcea69
2012-03-01 13:17:09 -08:00
Raphael Moll
9516dc5aa1 SDK: generate repo using latest schemas when available.
This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
2012-02-29 15:57:41 -08:00
Xavier Ducrohet
bea50d3562 SDK repo: use a template for samples/source.properties.
Use a template for samples/source.properties so that it automatically
picks up the current platform API level.

Also merges 52feec594a
("Update rev numbers of SDK packages.")

Change-Id: I89574842d2b0290cc6cf454f82a3721644cae0f0
2012-02-29 11:22:54 -08:00
Raphael Moll
b4ce1c006d SDK: Support generating XML with new name/vendor attributes.
Change-Id: I21f371879660d5b590a212fd81754fc5f128e428
2012-02-17 09:18:50 -08:00
Jean-Baptiste Queru
2ea5b27ef5 am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
* commit '96a4c2452e0f671abf3d66c6dfd9ac75f7105f70':
  Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 14:54:27 -08:00
Jean-Baptiste Queru
96a4c2452e am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
* commit '5539b1bf6be817b538e9490c826151415f445081':
  Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 14:51:40 -08:00
Raphael Moll
f06c958f3c Merge "Projects whitelisted for Windows SDK compilation."
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

(cherry-pick of 2b53ba5897)

Change-Id: I9ea5720291c9057aab3cd4f7f590fa2f7ae17444
2012-02-14 11:11:06 -08:00
Adam Powell
2eba3e3443 am 404be3bd: am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
* commit '404be3bd4c69682bd697ff0625382e86111c23b6':
  Add AppNavigation demo
2012-02-13 14:34:24 -08:00
Adam Powell
404be3bd4c am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
* commit '1b919a3fb80350a6ff1857c5c3d94d86766c0555':
  Add AppNavigation demo
2012-02-13 14:32:00 -08:00
Adam Powell
58589851a6 am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
2012-02-13 14:29:19 -08:00
Adam Powell
247df4fe79 Add AppNavigation demo
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.

Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
2012-02-07 15:02:57 -08:00
Raphael Moll
fd7545f53b Merge "Win SDK: add ext4_utils to project whitelist." 2012-02-06 15:42:10 -08:00
Tor Norbye
80437f41e5 Merge "Update default project icons, and add an xhdpi version" 2012-02-06 12:48:20 -08:00
Raphael Moll
0a94feb3fe Win SDK: add ext4_utils to project whitelist.
Change-Id: I00ce4e081d05608711f6e5e06dc5448309d76e94
2012-02-06 11:13:41 -08:00
Xavier Ducrohet
f9f0224103 am 54ee466c: am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1
* commit '54ee466c5389e0e9326258364a063e57e106ef5b':
  Move api.xml from tools/ to platform-tools/
2012-01-27 21:09:13 -08:00
Xavier Ducrohet
54ee466c53 am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1
* commit 'd4f9372a4dc45bafb7c962046459cc22f18e5098':
  Move api.xml from tools/ to platform-tools/
2012-01-27 12:02:42 -08:00
Tor Norbye
82374f6d8d Move api.xml from tools/ to platform-tools/
The API database was generated with code in sdk/apicheck/.

Change-Id: I42559fb47716f8ea2ee2d836375b523644dfe41c
2012-01-27 11:59:10 -08:00
Raphael Moll
2b53ba5897 Projects whitelisted for Windows SDK compilation.
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

Change-Id: Ie6f728bee2caea203865c4f861b657323f9f4c9c
2012-01-26 15:27:13 -08:00
Nick Pelly
a983c2a1a3 Update NFC samples.
o Remove NFCDemo sample app. It's janky and is mostly parsing code
  that isn't needed anymore.
o Use new NDEF APIs for parsing and creating records
o Use nicer setNdefPushMessage() API
o Delete helper NDEF code that is not needed any more
o Use URL instead of Text for the foreground push demo
o Mark AndroidBeamDemo a test so it gets installed in data not system

Change-Id: I75eda84019c2075956688e26f2598f126d5659a2
2012-01-25 13:16:52 -08:00