Commit Graph

4163 Commits

Author SHA1 Message Date
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
07155b40b4 am 46ea5655: am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
Merge commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac' into kraken

* commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac':
  change searchable dictionary folder name back to normal (exclude "v2", which
2010-05-10 13:48:59 -07:00
Scott Main
689176f33b am e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Merge commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6' into kraken

* commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6':
  add version code and name to searchable dictionary sample (make it v2)
2010-05-10 13:48:57 -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
e7506f8306 am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Merge commit '1b2c80841221bb69ca0384974fab462156cfc07d' into froyo-plus-aosp

* commit '1b2c80841221bb69ca0384974fab462156cfc07d':
  add version code and name to searchable dictionary sample (make it v2)
2010-05-10 13:47:12 -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
Scott Main
1b2c808412 add version code and name to searchable dictionary sample (make it v2)
Change-Id: Ie19c107528ef0df715936303baeda002efaef6cb
2010-05-10 12:34:08 -07:00
Xavier Ducrohet
54d1f9c9cf am 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit '33c1d23b012e9351667c85b2769b838a7f12b727' into kraken

* commit '33c1d23b012e9351667c85b2769b838a7f12b727':
  Fix target for library sample
2010-05-10 09:47:30 -07:00
Xavier Ducrohet
33c1d23b01 am ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6' into froyo-plus-aosp

* commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6':
  Fix target for library sample
2010-05-10 09:43:08 -07:00
Xavier Ducrohet
ca2327f1d4 Merge "Fix target for library sample" into froyo 2010-05-07 10:58:32 -07:00
Xavier Ducrohet
1959000ef1 Fix target for library sample
Change-Id: I89a1b6a7c7803ac52f5872e4b8a8696bb32ca5a3
2010-05-07 10:57:58 -07:00
Joe Malin
133188410d am 10cedd23: am 527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Merge commit '10cedd234b31ab785c61ddf3f101d9a5980a0ec2' into kraken

* commit '10cedd234b31ab785c61ddf3f101d9a5980a0ec2':
  Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
2010-05-07 09:55:34 -07:00
Joe Malin
10cedd234b am 527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Merge commit '527cfd6ef30a92a679aa2fff3d57f7024cebf609' into froyo-plus-aosp

* commit '527cfd6ef30a92a679aa2fff3d57f7024cebf609':
  Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
2010-05-07 09:54:29 -07:00
Joe Malin
527cfd6ef3 Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Change-Id: Ic4a1d28ea821ab7e35255d5a62ca0978cb9155ba
2010-05-07 09:48:47 -07:00
Dirk Dougherty
0f7185d921 am 9e678c26: am 2f0b1c13: Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
Merge commit '9e678c26d81ba76ad48e73cb7c78a6210cd91a7b' into kraken

* commit '9e678c26d81ba76ad48e73cb7c78a6210cd91a7b':
  Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
2010-05-07 09:21:55 -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
fd51be7a7e am e823f9eb: am cf997049: Fix the Library sample.
Merge commit 'e823f9ebc789718ee9061856f1f3951bfec562e1' into kraken

* commit 'e823f9ebc789718ee9061856f1f3951bfec562e1':
  Fix the Library sample.
2010-05-06 17:39:57 -07:00
Xavier Ducrohet
e823f9ebc7 am cf997049: Fix the Library sample.
Merge commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6' into froyo-plus-aosp

* commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6':
  Fix the Library sample.
2010-05-06 17:38:30 -07:00
Xavier Ducrohet
03c7c8b615 am 5542d32c: am fc7428f9: Add the TicTacToe Lib+Main samples
Merge commit '5542d32c67e31f4e39ff33904613ec722d42ddd1' into kraken

* commit '5542d32c67e31f4e39ff33904613ec722d42ddd1':
  Add the TicTacToe Lib+Main samples
2010-05-06 17:38:24 -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
cf9970499b Fix the Library sample.
Change-Id: I38d0336b8f1952d4e0424501dcd060d173624b5b
2010-05-06 17:35:35 -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
dd440b4067 am 02d92477: Merge commit \'goog/readonly-korg-master\' into HEAD
Merge commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05' into kraken

* commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05':
  Update sdk.atree with new ant rules location.
2010-05-06 15:16:03 -07:00
The Android Open Source Project
02d92477d5 Merge commit 'goog/readonly-korg-master' into HEAD 2010-05-06 15:07:55 -07:00
Kenny Root
3215afaee4 Update classpath for Eclipse DO NOT MERGE
Change-Id: Id16bde9c7eef953e7c31f86e8c485a9025294586
2010-05-06 12:01:08 -07:00
Kenny Root
5a5697c81a Spelling fix for source download page
Change-Id: I177310b80a2fe632823b6c7b7b63ec11e8e6e829
2010-05-05 18:06:45 -07:00
Xavier Ducrohet
360fba5491 Update sdk.atree with new ant rules location.
Change-Id: I8ff92a2343e1a4aa13ad4e8751e2a135eac09425
2010-05-05 15:56:12 -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
2236412788 merge from open-source master
Change-Id: Iee26d951b665e3cec3487dee026f6b529ea2c64d
2010-05-03 15:25:26 -07:00
Jean-Baptiste Queru
bb645bd59a Adapt to new location of libcore
Change-Id: I82b330562b4f0d2024e4fbe8235250abb029470c
2010-05-03 13:16:14 -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
fab98d832c am 67fa3142: Fix etc1tool to build in Windows SDK under Linux
Merge commit '67fa314265f47fc9360bcea990d8d67270fdefde' into froyo-plus-aosp

* commit '67fa314265f47fc9360bcea990d8d67270fdefde':
  Fix etc1tool to build in Windows SDK under Linux
2010-04-23 17:14:29 -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
Raphael
67fa314265 Fix etc1tool to build in Windows SDK under Linux
(Merges master Change Ib38a019b + Change I50f55004)

Change-Id: I2cbb63f0f20cdd2652b6b64ae0dee4343b952973
2010-04-23 13:12:03 -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
Jean-Baptiste Queru
a3799abcd4 am 8d53a13d: Merge "Add a backup provider for the SDK" into froyo
Merge commit '8d53a13daf1756dca86ddea8519ac43334e824fe' into froyo-plus-aosp

* commit '8d53a13daf1756dca86ddea8519ac43334e824fe':
  Add a backup provider for the SDK
2010-04-21 12:22:16 -07:00
Jean-Baptiste Queru
8d53a13daf Merge "Add a backup provider for the SDK" into froyo 2010-04-21 12:17:59 -07:00
Scott Main
891b4e9d50 am beca3af7: cherry-pick from master: 3c26ae869e
Merge commit 'beca3af74d2a5baeba00ada49ba2480d36535f5e' into froyo-plus-aosp

* commit 'beca3af74d2a5baeba00ada49ba2480d36535f5e':
  cherry-pick from master: 3c26ae869e
2010-04-21 11:42:29 -07:00
Scott Main
beca3af74d cherry-pick from master: 3c26ae869e
new version of the Searchable Dictionary that saves all the words
in an SQLite Database and FTS3 table, then performs all look ups
using the content provider, plus various style modifications.
2010-04-21 10:44:50 -07:00
Jean-Baptiste Queru
486681280e Add a backup provider for the SDK
Bug: 2611374
Change-Id: I3907a48b2ec380b3f7c3bc168d0529809e098cf7
2010-04-21 09:35:02 -07:00
The Android Open Source Project
d428e48aa1 merge from open-source master
Change-Id: Ia811827c7fce6b14ec6f8f9dc5f5305be6138127
2010-04-21 09:10:10 -07:00
Raphael Moll
3d96f18dd1 Update the docs explaining how to build an SDK.
Change-Id: Ibb2ddb751ac6779b6bbbbcf4cb610d4d86280fee
2010-04-19 15:31:07 -07:00
The Android Open Source Project
03f73ba453 merge from open-source master
Change-Id: I160f8677dc9fb144b3a3190ee4ea500cad71af2b
2010-04-16 12:36:27 -07:00
Xavier Ducrohet
728457dc74 Fix instructions on how to build the doc.
Change-Id: Id9cde46b38a74f0f6ee368fdc43aee8ec6082b5f
2010-04-15 17:26:58 -07:00
Ying Wang
c05b83d138 am 84086578: Add timestamp to monkey log
Merge commit '84086578bb07eb65c141f5cba0c5e31a12d44c17' into froyo-plus-aosp

* commit '84086578bb07eb65c141f5cba0c5e31a12d44c17':
  Add timestamp to monkey log
2010-04-14 20:58:40 -07:00