Commit Graph

129 Commits

Author SHA1 Message Date
Xavier Ducrohet
7a3e7b1b9a Update sdk.prop for the platform SDK component.
sdk.properties should be stored in development.git and
not sdk.git so move it here.

Change-Id: I32e166927ea91cad36d66bb14e90cb36ccb3bc82
2011-01-18 14:21:55 -08:00
Jack Palevich
ebb6bc2fc8 Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.

Change-Id: Iee83ca6a52eee64e8c6b77bc9a8abff11a1eabfd
2011-01-17 17:48:44 -08:00
Xavier Ducrohet
a67b557e13 Merge "Add RS includes to the SDK and update skin list." into honeycomb 2011-01-16 19:16:16 -08:00
Winson Chung
eb80909dfc Adding WidgetPreview utility.
Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
2011-01-16 17:13:16 -08:00
Xavier Ducrohet
14f3c60f50 Add RS includes to the SDK and update skin list.
Change-Id: Id453585e5c1f4d80336bd2fc837afbc7a0a0d097
2011-01-16 13:21:52 -08:00
Raphael
32d597b5b7 Add llvm-rs-cc to the SDK (all platforms)
Change-Id: I6077251d0a34678e708ddd25068a511159ba7460
2011-01-13 16:59:09 -08:00
Xavier Ducrohet
9709bd228b Add WXGA skin.
Change-Id: I29e62d5a1bf9d5017bfdca9fe07ae4e3124f951c
2011-01-07 14:37:37 -08:00
Xavier Ducrohet
300b84c427 Cherry-pick f0e5e933 from master.
Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: Ic22592573d6d153fb94e2e2c981068936cae1219
2011-01-07 13:04:25 -08:00
Raphael Moll
1c0b37567b am 40812f1c: am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"
* commit '40812f1c4b312d8276eb2839c06d2d76dd4f97e1':
  Use OUT_DIR in atree to find android.jar
2011-01-05 15:50:28 -08:00
Raphael Moll
40812f1c4b am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"
* commit '1bf9f6936e423a686b623752e9f008acefaa1057':
  Use OUT_DIR in atree to find android.jar
2011-01-05 15:48:26 -08:00
Raphael Moll
c2e8083255 Use OUT_DIR in atree to find android.jar
Depends on change Iabbe9053 from build/core.

Change-Id: I0b6e29a5282c2ca6ff329981e5f8d2c677e6e84b
2011-01-05 14:59:27 -08:00
Dirk Dougherty
6499e7fc3a am 49b989c3: am 4171f296: Add AcceleromerPlay sample app to SDK samples package
* commit '49b989c36a07a2440d94ec4f6c899f4e30be1799':
  Add AcceleromerPlay sample app to SDK samples package
2010-11-29 18:15:36 -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
f5d68235fa am fb381e9f: am c73f37ba: Remove HeavyWeight sample from SDK samples package.
* commit 'fb381e9ff5cdc18d2a5463dc858980e3a609b8d0':
  Remove HeavyWeight sample from SDK samples package.
2010-11-29 17:09:37 -08:00
Dirk Dougherty
c73f37ba57 Remove HeavyWeight sample from SDK samples package.
Change-Id: Id2113b8a0cd1a7cc3d807919e6c40c50917baaea
2010-11-29 17:03:46 -08:00
Dirk Dougherty
b9beb6c055 Remove NFCDemo from sdk samples to fix build.
Change-Id: I7ab8743d39a5a0cf60d68544c4e94c786224f78e
2010-11-29 16:57:20 -08:00
Roman Nurik
02cdaff475 am 624ae678: am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
* commit '624ae678ef28e9abc4902bc49d7a23dbdb63f180':
  Add NFCDemo to sdk.atree
2010-11-29 16:04:40 -08:00
Roman Nurik
9488e4296e Add NFCDemo to sdk.atree
Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403
2010-11-29 15:45:50 -08:00
Alexander Lucas
40090497c6 am 655f02a4: am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
* commit '655f02a45669ce3b03d96cd8634bfe3745b6f725':
  Added SIP Demo to sample apps.
2010-11-04 07:20:40 -07:00
Alexander Lucas
a025796211 Added SIP Demo to sample apps.
Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
2010-11-03 13:21:52 -07:00
Kenny Root
10540d6528 resolved conflicts for merge of 6c99a051 to master
Change-Id: I0bae8e92609253924f0c7adbc59f8c45394f341a
2010-10-15 00:14:56 -07:00
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme.
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
2010-10-13 13:38:45 -07:00
Xavier Ducrohet
76afc004df Integrate sdk.atree changes from master. DO NOT MERGE
- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree

Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
2010-09-30 11:33:21 -07:00
Xavier Ducrohet
87bfd07634 am 92d47e4e: am 682ec293: Split the tools component from sdk.atree
Merge commit '92d47e4ef65c225bcf82c81377412d5c67349ff5'

* commit '92d47e4ef65c225bcf82c81377412d5c67349ff5':
  Split the tools component from sdk.atree
2010-09-30 11:27:02 -07:00
Xavier Ducrohet
92d47e4ef6 am 682ec293: Split the tools component from sdk.atree
Merge commit '682ec293359cf4ac8c61df25bb05519b604b17eb' into gingerbread-plus-aosp

* commit '682ec293359cf4ac8c61df25bb05519b604b17eb':
  Split the tools component from sdk.atree
2010-09-30 08:52:23 -07:00
Xavier Ducrohet
682ec29335 Split the tools component from sdk.atree
This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
2010-09-28 08:37:24 -07:00
Xavier Ducrohet
6f1718bab5 am daa454cb: am 64e53fe5: Merge "Move adb to the platform-tools."
Merge commit 'daa454cb3ba51dcf75330955dc899d35a7b60989'

* commit 'daa454cb3ba51dcf75330955dc899d35a7b60989':
  Move adb to the platform-tools.
2010-09-27 21:29:10 -07:00
Xavier Ducrohet
daa454cb3b am 64e53fe5: Merge "Move adb to the platform-tools."
Merge commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp

* commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b':
  Move adb to the platform-tools.
2010-09-27 16:44:55 -07:00
Xavier Ducrohet
6a8e50f695 Move adb to the platform-tools.
Also fixed the packaging of hierarchyViewer in the SDK

Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00
Xavier Ducrohet
c54f778e92 am 591b5edf: am d5964750: Package Proguard with the SDK.
Merge commit '591b5edf255a5872fbfb5424f3ee0028fd036d08'

* commit '591b5edf255a5872fbfb5424f3ee0028fd036d08':
  Package Proguard with the SDK.
2010-09-17 16:10:58 -07:00
Xavier Ducrohet
591b5edf25 am d5964750: Package Proguard with the SDK.
Merge commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f' into gingerbread-plus-aosp

* commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f':
  Package Proguard with the SDK.
2010-09-17 14:31:47 -07:00
Xavier Ducrohet
d59647505d Package Proguard with the SDK.
Change-Id: Ia3effdf9465edbe55d5a691bf7bad163e95bb625
2010-09-16 15:54:37 -07:00
Megha Joshi
8d74e52a0a resolved conflicts for merge of 292096fc to master
Change-Id: I2a0d13b3b36aaf3fd6d6b1161bb75ae5ae890630
2010-09-14 10:39:56 -07:00
Megha Joshi
3471dafa11 am 42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread

* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
  Adding CrossCompatibility sample app.
2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14 Adding CrossCompatibility sample app.
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
2010-09-13 17:00:10 -07:00
Xavier Ducrohet
3aecc4de01 New SDK architecture. DO NOT MERGE.
tools normally under the platform, move to a single location
called platform-tools/

Change-Id: I70659167778303722acb107a2d04bbf01467f884
2010-08-30 16:01:45 -07:00
Svetoslav Ganov
d739fa797a am b0772436: am 4b06026c: am 9f93186b: Adding a sample accessibility service
Merge commit 'b07724366ebd73ef3e9daa1d772a633cd331f2b4'

* commit 'b07724366ebd73ef3e9daa1d772a633cd331f2b4':
  Adding a sample accessibility service
2010-08-17 10:56:26 -07:00
Svetoslav Ganov
b07724366e am 4b06026c: am 9f93186b: Adding a sample accessibility service
Merge commit '4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp

* commit '4b06026cb901d4a032ecc731a835767ff1bf27fe':
  Adding a sample accessibility service
2010-08-17 10:48:34 -07:00
Svetoslav Ganov
4b06026cb9 am 9f93186b: Adding a sample accessibility service
Merge commit '9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread

* commit '9f93186beae13ea057a4b2e867928b357cd650a4':
  Adding a sample accessibility service
2010-08-17 10:45:23 -07:00
Svetoslav Ganov
9f93186bea Adding a sample accessibility service
Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
2010-08-11 14:45:56 -07:00
Xavier Ducrohet
3cf2a3ac06 am 7d3106be: am b86b7f72: Re-organize the SDK, moving the build tools out of the platforms.
Merge commit '7d3106bebbfe76a334567c59303a75897af915b2'

* commit '7d3106bebbfe76a334567c59303a75897af915b2':
  Re-organize the SDK, moving the build tools out of the platforms.
2010-07-30 11:33:05 -07:00
Xavier Ducrohet
7d3106bebb am b86b7f72: Re-organize the SDK, moving the build tools out of the platforms.
Merge commit 'b86b7f72db1549cb526a141ca8b6158908483f1a' into gingerbread-plus-aosp

* commit 'b86b7f72db1549cb526a141ca8b6158908483f1a':
  Re-organize the SDK, moving the build tools out of the platforms.
2010-07-30 11:29:30 -07:00
Xavier Ducrohet
b86b7f72db Re-organize the SDK, moving the build tools out of the platforms.
Change-Id: I4526310a1c882ad33084d94e118b1c74b3181a6a
2010-07-28 16:01:06 -07:00
Gilles Debunne
55f4a60aa0 New XmlAdapter sample example.
This sample illustrate the use of the news Xml Adapters definition, as well
as the use on the new XmlDocumentProvider class.

Change-Id: Ie9738b5f0a0f00df2af643890a48573bace19311
2010-06-24 09:44:57 -07:00
The Android Open Source Project
906d47573b merge from open-source master
Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
2010-06-18 11:33:52 -07:00
Xavier Ducrohet
fdbc1d7bc1 remove apkbuilder.jar from the sdk build.
Change-Id: I76f979a0d3aa196f25e8a5f2522437e26655a7d0
2010-06-16 18:10:41 -07:00
Xavier Ducrohet
1cabf853fd remove apkbuilder.jar from the sdk build.
Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
2010-06-15 18:04:44 -07:00
Xavier Ducrohet
442396be27 remove jarutils from the sdk packaging.
Change-Id: I49beab11b49f09451cbea9bfbc88aa522e7dbd85
2010-06-15 15:35:07 -07:00
The Android Open Source Project
e7a4c0910c merge from open-source master
Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
2010-06-15 15:02:39 -07:00
Xavier Ducrohet
4c22d2bb7d remove jarutils from the sdk packaging.
Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
2010-06-15 13:00:13 -07:00