Commit Graph

174 Commits

Author SHA1 Message Date
Raphael Moll
23d595f53c am 059e4eb3: am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Merge commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455'

* commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455':
  SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
2010-08-26 13:14:29 -07:00
Raphael Moll
059e4eb3db am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Merge commit 'f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp

* commit 'f08d230ed0d2612e79c121e0afa1e439b5702815':
  SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
2010-08-26 09:02:13 -07:00
Raphael Moll
f08d230ed0 SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Change-Id: Id85ec31d80fc12a6907d9c3404a29d28d4923abd
2010-08-23 13:38:02 -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
Raphael Moll
99e27c0f08 am 4336dcc6: am ff779c0f: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c'

* commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-08-10 11:45:02 -07:00
Raphael Moll
4336dcc64b am ff779c0f: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd' into gingerbread-plus-aosp

* commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-08-10 11:39:50 -07:00
Raphael Moll
ff779c0f2a Update win_sdk to put binaries in SDK/platform-tools.
This is requires as a follow up to Change I4526310a
with moved platform tools from $SDK/platform/*/tools
to $SDK/platform-tools/

SDK Bug: 2897406

Change-Id: I1563c88fc824db3d9c86fb65479820989d46895c
2010-08-05 13:32:03 -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
Joe Onorato
8c490dc8d1 am 6b9784b0: am 288d90c2: Merge "The "current" SDK stubs jar should use the full apk that\'s exported, not the product-specific one." into gingerbread
Merge commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75'

* commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75':
  The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
2010-07-15 11:16:38 -07:00
Joe Onorato
6e384d9b43 The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
The SDK is not dependent on configurations, and also this speeds up the post-installclean build.

Change-Id: I1c075ddf1dd2ca44cc0aa37f23e86ccc593cc2a8
2010-07-14 19:56:38 -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
Kenny Root
b606d1bea2 am 60c91105: am 9e1400cd: Do not compress resources.arsc in android.jar
Merge commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e'

* commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e':
  Do not compress resources.arsc in android.jar
2010-06-23 13:56:38 -07:00
Kenny Root
9e1400cdae Do not compress resources.arsc in android.jar
In framework-res.apk and in applications, resources are always stored in
zip files instead of compressed so that they may be accessed via mmap()
instead of needing to decompress them first.

This change makes sure the SDK's android.jar has the same behavior.

Change-Id: Ied881c34dca86ff5b5bd2ccfa4e316ae590ca473
2010-06-23 13:40:41 -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
32b1e17b75 am 2f8cb6de: am fdbc1d7b: remove apkbuilder.jar from the sdk build.
Merge commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9'

* commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9':
  remove apkbuilder.jar from the sdk build.
2010-06-16 19:41:49 -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
66bdf7ff57 am e389abdc: am 442396be: remove jarutils from the sdk packaging.
Merge commit 'e389abdc29eb2a9d523e64531975dde25a8e9617'

* commit 'e389abdc29eb2a9d523e64531975dde25a8e9617':
  remove jarutils from the sdk packaging.
2010-06-15 16:01:29 -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
Ying Wang
7d68266c86 Also dist the original linux sdk package for wind_sdk build.
Change-Id: I64dab5763dc7c7398582c5a30c126c7e3e6afe32
2010-06-15 09:24:35 -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
3adbb98dff 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)." into froyo 2010-04-27 10:32:44 -07:00
Raphael
262113ac94 am 0e4dd618: Makefile to create Windows SDK under Linux.
Merge commit '0e4dd618494c577b8e8dcb0c7f525617b0a72fc4' into froyo-plus-aosp

* commit '0e4dd618494c577b8e8dcb0c7f525617b0a72fc4':
  Makefile to create Windows SDK under Linux.
2010-04-23 17:14:56 -07:00
Raphael
0e4dd61849 Makefile to create Windows SDK under Linux.
The makefile makes it possible to "make PRODUCT-sdk-win_sdk".
It builds the Linux SDK, mirrors it as a Windows SDK and then use the shell
script to patch in all the Windows binaries.

(Merge master Change Ie24f765b)
2010-04-23 13:16:16 -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