LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,858 Commits 2 Branches 0 Tags
8b51a39fda458039e68b650eb46f90b95f4bddca
Commit Graph

257 Commits

Author SHA1 Message Date
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
Dianne Hackborn
db974ee7bd Dumb. 
Change-Id: I05f17560ace880c628c94d676bd908c611348029
 2010-06-04 14:13:27 -07:00
Dianne Hackborn
2e952670a2 Add API demo of a heavy-weight application. 
Change-Id: I15e2d1c766af8aa7a62beed3069b8d128338ca11
 2010-06-04 13:39:37 -07:00
Dirk Dougherty
8bfa91f076 am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds. 
Merge commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d' into froyo-plus-aosp

* commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
 2010-05-11 10:18:43 -07:00
Dirk Dougherty
56c8df1b06 sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds. 
Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
 2010-05-10 16:12:24 -07:00
Scott Main
46ea565515 am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles) 
Merge commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0' into froyo-plus-aosp

* commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0':
  change searchable dictionary folder name back to normal (exclude "v2", which
 2010-05-10 13:47:14 -07:00
Scott Main
6807387d71 change searchable dictionary folder name back to normal (exclude "v2", which 
should instead be used only for HTML titles)

Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
 2010-05-10 12:46:19 -07:00
Dirk Dougherty
9e678c26d8 am 2f0b1c13: Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial 
Merge commit '2f0b1c1335f6212889633e170d71c56dba70e78e' into froyo-plus-aosp

* commit '2f0b1c1335f6212889633e170d71c56dba70e78e':
  Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
 2010-05-07 09:20:00 -07:00
Dirk Dougherty
2f0b1c1335 Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial 
Conflicts:

	build/sdk.atree

Change-Id: I5edb1d4d8a18fbda53a0e78ca6c9d20cf7d3ff4a
 2010-05-07 09:16:56 -07:00
Xavier Ducrohet
5542d32c67 am fc7428f9: Add the TicTacToe Lib+Main samples 
Merge commit 'fc7428f91254740a245fdac5db77d035c0b4c41f' into froyo-plus-aosp

* commit 'fc7428f91254740a245fdac5db77d035c0b4c41f':
  Add the TicTacToe Lib+Main samples
 2010-05-06 17:36:56 -07:00
Xavier Ducrohet
fc7428f912 Add the TicTacToe Lib+Main samples 
Change-Id: I17a26172ab82b2e4b794774c5ab94bed8202b7d4
 2010-05-06 16:53:09 -07:00
The Android Open Source Project
02d92477d5 Merge commit 'goog/readonly-korg-master' into HEAD 2010-05-06 15:07:55 -07:00
Xavier Ducrohet
36cb47e677 Update sdk.atree with new ant rules location. 
Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
 2010-05-05 14:13:49 -07:00
The Android Open Source Project
51ecd212b6 merge from open-source master 
Change-Id: I5b1a7e1448dc3bfeb499201e0332de550da1380a
 2010-04-28 12:55:21 -07:00
Xavier Ducrohet
a61e3cd438 Package Ant rules r3 
Change-Id: I2c5fca2ac89a54499f243670bbe858affa8770c3
 2010-04-27 16:05:41 -07:00
Scott Main
096f06bef2 am 3adbb98d: Merge "title the searchable dictionary app as "v2" because it includes significant changes and it\'s worth highlighting the revision. some revisions to the sample desciption. a companion change to the resources navigation link will follow (to name it v2)." 
Merge commit '3adbb98dff3b1cbafcd9aadfc8708f4b88030497' into froyo-plus-aosp

* commit '3adbb98dff3b1cbafcd9aadfc8708f4b88030497':
  title the searchable dictionary app as "v2" because it includes significant
 2010-04-27 10:35:50 -07:00
Scott Main
05bd673250 title the searchable dictionary app as "v2" because it includes significant 
changes and it's worth highlighting the revision.
some revisions to the sample desciption.
a companion change to the resources navigation link will follow (to name it v2).

Change-Id: Ib11cae9e4cc753f76b45ae446ef9871fee674e7a
 2010-04-23 07:39:05 -07:00
The Android Open Source Project
19495e9285 merge from open-source master 
Change-Id: Ic084784dc5ca0f98367b2824261be0be4f9617bf
 2010-04-12 13:11:26 -07:00
Xavier Ducrohet
cd2dfa72cb Fix SDK build by packaging the new Ant rules files. 
Change-Id: Id88eeb0e596b58e48f425c7521fb40f9e046b818
 2010-04-09 14:00:34 -07:00
Xavier Ducrohet
9cd63801a5 Update SDK build file to package the correct version for groovy. 
Change-Id: I0e81a9941693acc0f29933aa15bb7d4e7689bf51
 2010-04-09 13:19:15 -07:00
Christopher Tate
41c42a972c Add Backup/Restore sample to the SDK docs 
Part of bug #2545514

Change-Id: I9085ebfdce3552ddab602eec8d40de67b219a834
 2010-04-07 13:41:35 -07:00
Xavier Ducrohet
5f0ab86970 Package the new ant rules file in the SDK. 
Change-Id: Ic4db70e75b7a747c86635d9f28cfb98537c0e9a1
 2010-03-18 14:38:52 -07:00
Xavier Ducrohet
d87ae80254 Change ant.prop to sdk.prop 
Change-Id: I45bb6652b2ae9455e20d681555f2bb61e11f9ce7
 2010-03-10 16:52:06 -08:00