OSDN Git Service
Scott Main [Mon, 10 May 2010 20:48:59 +0000 (13:48 -0700)]
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
Scott Main [Mon, 10 May 2010 20:48:57 +0000 (13:48 -0700)]
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)
Scott Main [Mon, 10 May 2010 20:47:14 +0000 (13:47 -0700)]
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
Scott Main [Mon, 10 May 2010 20:47:12 +0000 (13:47 -0700)]
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)
Scott Main [Mon, 10 May 2010 15:04:51 +0000 (08:04 -0700)]
change searchable dictionary folder name back to normal (exclude "v2", which
should instead be used only for HTML titles)
Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
Scott Main [Fri, 7 May 2010 22:10:14 +0000 (15:10 -0700)]
add version code and name to searchable dictionary sample (make it v2)
Change-Id: Ie19c107528ef0df715936303baeda002efaef6cb
Xavier Ducrohet [Mon, 10 May 2010 16:47:30 +0000 (09:47 -0700)]
am
33c1d23b: am
ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit '
33c1d23b012e9351667c85b2769b838a7f12b727' into kraken
* commit '
33c1d23b012e9351667c85b2769b838a7f12b727':
Fix target for library sample
Xavier Ducrohet [Mon, 10 May 2010 16:43:08 +0000 (09:43 -0700)]
am
ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit '
ca2327f1d44fcd66c4a9396e4e70471f1075eae6' into froyo-plus-aosp
* commit '
ca2327f1d44fcd66c4a9396e4e70471f1075eae6':
Fix target for library sample
Xavier Ducrohet [Fri, 7 May 2010 17:58:32 +0000 (10:58 -0700)]
Merge "Fix target for library sample" into froyo
Xavier Ducrohet [Fri, 7 May 2010 17:57:58 +0000 (10:57 -0700)]
Fix target for library sample
Change-Id: I89a1b6a7c7803ac52f5872e4b8a8696bb32ca5a3
Joe Malin [Fri, 7 May 2010 16:55:34 +0000 (09:55 -0700)]
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...
Joe Malin [Fri, 7 May 2010 16:54:29 +0000 (09:54 -0700)]
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...
Joe Malin [Wed, 21 Apr 2010 02:54:58 +0000 (19:54 -0700)]
Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Change-Id: Ic4a1d28ea821ab7e35255d5a62ca0978cb9155ba
Dirk Dougherty [Fri, 7 May 2010 16:21:55 +0000 (09:21 -0700)]
am
9e678c26: am
2f0b1c13: Doc change: cherry-pick from ->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
Dirk Dougherty [Fri, 7 May 2010 16:20:00 +0000 (09:20 -0700)]
am
2f0b1c13: Doc change: cherry-pick from ->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
Dirk Dougherty [Fri, 7 May 2010 16:11:24 +0000 (09:11 -0700)]
Doc change: cherry-pick from ->Subject: Android application files for the Activity Testing Tutorial
Conflicts:
build/sdk.atree
Change-Id: I5edb1d4d8a18fbda53a0e78ca6c9d20cf7d3ff4a
Xavier Ducrohet [Fri, 7 May 2010 00:39:57 +0000 (17:39 -0700)]
am
e823f9eb: am
cf997049: Fix the Library sample.
Merge commit '
e823f9ebc789718ee9061856f1f3951bfec562e1' into kraken
* commit '
e823f9ebc789718ee9061856f1f3951bfec562e1':
Fix the Library sample.
Xavier Ducrohet [Fri, 7 May 2010 00:38:30 +0000 (17:38 -0700)]
am
cf997049: Fix the Library sample.
Merge commit '
cf9970499bfcce80d92c2fe37fd552e586c177b6' into froyo-plus-aosp
* commit '
cf9970499bfcce80d92c2fe37fd552e586c177b6':
Fix the Library sample.
Xavier Ducrohet [Fri, 7 May 2010 00:38:24 +0000 (17:38 -0700)]
am
5542d32c: am
fc7428f9: Add the TicTacToe Lib+Main samples
Merge commit '
5542d32c67e31f4e39ff33904613ec722d42ddd1' into kraken
* commit '
5542d32c67e31f4e39ff33904613ec722d42ddd1':
Add the TicTacToe Lib+Main samples
Xavier Ducrohet [Fri, 7 May 2010 00:36:56 +0000 (17:36 -0700)]
am
fc7428f9: Add the TicTacToe Lib+Main samples
Merge commit '
fc7428f91254740a245fdac5db77d035c0b4c41f' into froyo-plus-aosp
* commit '
fc7428f91254740a245fdac5db77d035c0b4c41f':
Add the TicTacToe Lib+Main samples
Xavier Ducrohet [Fri, 7 May 2010 00:35:35 +0000 (17:35 -0700)]
Fix the Library sample.
Change-Id: I38d0336b8f1952d4e0424501dcd060d173624b5b
Xavier Ducrohet [Thu, 6 May 2010 23:53:09 +0000 (16:53 -0700)]
Add the TicTacToe Lib+Main samples
Change-Id: I17a26172ab82b2e4b794774c5ab94bed8202b7d4
The Android Open Source Project [Thu, 6 May 2010 22:16:03 +0000 (15:16 -0700)]
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.
The Android Open Source Project [Thu, 6 May 2010 22:07:55 +0000 (15:07 -0700)]
Merge commit 'goog/readonly-korg-master' into HEAD
Kenny Root [Thu, 6 May 2010 16:20:01 +0000 (09:20 -0700)]
Update classpath for Eclipse DO NOT MERGE
Change-Id: Id16bde9c7eef953e7c31f86e8c485a9025294586
Xavier Ducrohet [Wed, 5 May 2010 21:13:49 +0000 (14:13 -0700)]
Update sdk.atree with new ant rules location.
Change-Id: I8ff92a2343e1a4aa13ad4e8751e2a135eac09425
Xavier Ducrohet [Wed, 5 May 2010 21:13:49 +0000 (14:13 -0700)]
Update sdk.atree with new ant rules location.
Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
The Android Open Source Project [Mon, 3 May 2010 22:25:26 +0000 (15:25 -0700)]
merge from open-source master
Change-Id: Iee26d951b665e3cec3487dee026f6b529ea2c64d
Jean-Baptiste Queru [Mon, 3 May 2010 19:38:07 +0000 (12:38 -0700)]
Adapt to new location of libcore
Change-Id: I82b330562b4f0d2024e4fbe8235250abb029470c
The Android Open Source Project [Wed, 28 Apr 2010 19:55:21 +0000 (12:55 -0700)]
merge from open-source master
Change-Id: I5b1a7e1448dc3bfeb499201e0332de550da1380a
Xavier Ducrohet [Tue, 27 Apr 2010 23:05:41 +0000 (16:05 -0700)]
Package Ant rules r3
Change-Id: I2c5fca2ac89a54499f243670bbe858affa8770c3
Scott Main [Tue, 27 Apr 2010 17:35:50 +0000 (10:35 -0700)]
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
Scott Main [Tue, 27 Apr 2010 17:32:44 +0000 (10:32 -0700)]
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
Raphael [Sat, 24 Apr 2010 00:14:56 +0000 (17:14 -0700)]
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.
Raphael [Sat, 24 Apr 2010 00:14:29 +0000 (17:14 -0700)]
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
Raphael [Sat, 17 Apr 2010 00:37:25 +0000 (17:37 -0700)]
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)
Raphael [Fri, 23 Apr 2010 20:12:03 +0000 (13:12 -0700)]
Fix etc1tool to build in Windows SDK under Linux
(Merges master Change Ib38a019b + Change I50f55004)
Change-Id: I2cbb63f0f20cdd2652b6b64ae0dee4343b952973
Scott Main [Thu, 22 Apr 2010 18:01:17 +0000 (11:01 -0700)]
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
Jean-Baptiste Queru [Wed, 21 Apr 2010 19:22:16 +0000 (12:22 -0700)]
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
Jean-Baptiste Queru [Wed, 21 Apr 2010 19:17:59 +0000 (12:17 -0700)]
Merge "Add a backup provider for the SDK" into froyo
Scott Main [Wed, 21 Apr 2010 18:42:29 +0000 (11:42 -0700)]
Scott Main [Fri, 26 Mar 2010 00:37:25 +0000 (17:37 -0700)]
cherry-pick from master:
3c26ae869e24e6cd7c63dc44fc3f46221262e15f
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.
Jean-Baptiste Queru [Wed, 21 Apr 2010 16:35:02 +0000 (09:35 -0700)]
Add a backup provider for the SDK
Bug:
2611374
Change-Id: I3907a48b2ec380b3f7c3bc168d0529809e098cf7
The Android Open Source Project [Wed, 21 Apr 2010 16:10:10 +0000 (09:10 -0700)]
merge from open-source master
Change-Id: Ia811827c7fce6b14ec6f8f9dc5f5305be6138127
Raphael Moll [Sun, 18 Apr 2010 07:04:01 +0000 (00:04 -0700)]
Update the docs explaining how to build an SDK.
Change-Id: Ibb2ddb751ac6779b6bbbbcf4cb610d4d86280fee
The Android Open Source Project [Fri, 16 Apr 2010 19:36:27 +0000 (12:36 -0700)]
merge from open-source master
Change-Id: I160f8677dc9fb144b3a3190ee4ea500cad71af2b
Xavier Ducrohet [Fri, 16 Apr 2010 00:26:58 +0000 (17:26 -0700)]
Fix instructions on how to build the doc.
Change-Id: Id9cde46b38a74f0f6ee368fdc43aee8ec6082b5f
Ying Wang [Thu, 15 Apr 2010 03:58:40 +0000 (20:58 -0700)]
am
84086578: Add timestamp to monkey log
Merge commit '
84086578bb07eb65c141f5cba0c5e31a12d44c17' into froyo-plus-aosp
* commit '
84086578bb07eb65c141f5cba0c5e31a12d44c17':
Add timestamp to monkey log
Ying Wang [Thu, 15 Apr 2010 01:48:02 +0000 (18:48 -0700)]
Add timestamp to monkey log
Change-Id: Ia477aca8b00d06049621d848f5792c291e3db040
The Android Open Source Project [Mon, 12 Apr 2010 20:11:26 +0000 (13:11 -0700)]
merge from open-source master
Change-Id: Ic084784dc5ca0f98367b2824261be0be4f9617bf
Dirk Dougherty [Sat, 10 Apr 2010 18:38:00 +0000 (11:38 -0700)]
am
4a541438: Merge "SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version." into froyo
Merge commit '
4a5414381b1abe693101f18a4d483ed5ddff55ec' into froyo-plus-aosp
* commit '
4a5414381b1abe693101f18a4d483ed5ddff55ec':
SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version.
Dirk Dougherty [Sat, 10 Apr 2010 02:00:07 +0000 (19:00 -0700)]
Merge "SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version." into froyo
Dirk Dougherty [Sat, 10 Apr 2010 01:45:51 +0000 (18:45 -0700)]
SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version.
Change-Id: Id778ba96936c6ed5c3c5ec6c76e476f1fa7036bf
Xavier Ducrohet [Fri, 9 Apr 2010 21:11:16 +0000 (14:11 -0700)]
Merge "Fix SDK build by packaging the new Ant rules files."
Xavier Ducrohet [Fri, 9 Apr 2010 21:00:34 +0000 (14:00 -0700)]
Fix SDK build by packaging the new Ant rules files.
Change-Id: Id88eeb0e596b58e48f425c7521fb40f9e046b818
The Android Open Source Project [Fri, 9 Apr 2010 20:52:58 +0000 (13:52 -0700)]
Delete NDK, moved into its own project
Change-Id: Ia51e76d7a9995fb43a096ebbdfa908f84d9da59c
Xavier Ducrohet [Fri, 9 Apr 2010 20:14:58 +0000 (13:14 -0700)]
Update SDK build file to package the correct version for groovy.
Change-Id: I0e81a9941693acc0f29933aa15bb7d4e7689bf51
Brett Chabot [Thu, 8 Apr 2010 19:09:48 +0000 (12:09 -0700)]
am
3804ab42: Change VoiceRecognitionService sample to use API 8 instead of froyo.
Merge commit '
3804ab420be1f7f3c49cd91b695800209db6a346' into froyo-plus-aosp
* commit '
3804ab420be1f7f3c49cd91b695800209db6a346':
Change VoiceRecognitionService sample to use API 8 instead of froyo.
Brett Chabot [Thu, 8 Apr 2010 18:32:08 +0000 (11:32 -0700)]
Change VoiceRecognitionService sample to use API 8 instead of froyo.
Bug
2581621
Change-Id: Idab0afe6e6c85edba9d2af3d9d5961fe77d1ea14
Christopher Tate [Wed, 7 Apr 2010 21:22:17 +0000 (14:22 -0700)]
am
3356ba35: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Merge commit '
3356ba35fa7632fc801210f46d3ec10d1b6cf6a1' into froyo-plus-aosp
* commit '
3356ba35fa7632fc801210f46d3ec10d1b6cf6a1':
Add Backup/Restore sample to the SDK docs
Christopher Tate [Wed, 7 Apr 2010 21:19:40 +0000 (14:19 -0700)]
Merge "Add Backup/Restore sample to the SDK docs" into froyo
Christopher Tate [Wed, 7 Apr 2010 18:16:48 +0000 (11:16 -0700)]
Add Backup/Restore sample to the SDK docs
Part of bug #
2545514
Change-Id: I9085ebfdce3552ddab602eec8d40de67b219a834
Ray Chen [Wed, 7 Apr 2010 19:09:39 +0000 (12:09 -0700)]
am
f617797e: Merge "API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener." into froyo
Merge commit '
f617797e88f958a09f8262d0b362bd74d129f575' into froyo-plus-aosp
* commit '
f617797e88f958a09f8262d0b362bd74d129f575':
API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener.
Ray Chen [Wed, 7 Apr 2010 19:06:03 +0000 (12:06 -0700)]
Merge "API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener." into froyo
Christopher Tate [Wed, 7 Apr 2010 18:16:43 +0000 (11:16 -0700)]
am
406ed04d: Merge "Backup/Restore sample application" into froyo
Merge commit '
406ed04d5a6b37dd9ed439ea954a1f23ac675138' into froyo-plus-aosp
* commit '
406ed04d5a6b37dd9ed439ea954a1f23ac675138':
Backup/Restore sample application
Christopher Tate [Wed, 7 Apr 2010 18:12:24 +0000 (11:12 -0700)]
Merge "Backup/Restore sample application" into froyo
Ray Chen [Tue, 6 Apr 2010 22:16:13 +0000 (15:16 -0700)]
API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener.
Change-Id: I1386394dbccda4c01e50d89b8fdeca97ee65a29f
Raphael [Tue, 6 Apr 2010 21:36:31 +0000 (14:36 -0700)]
am
39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo
Merge commit '
39637a37fb0074ad0d86c9f30aab5a0cae9ed26c' into froyo-plus-aosp
* commit '
39637a37fb0074ad0d86c9f30aab5a0cae9ed26c':
Project-lib sample: define lib activity.
Switch from codename Froyo to API 8.
Raphael [Tue, 6 Apr 2010 21:34:21 +0000 (14:34 -0700)]
Merge changes I3641b7c0,Ibdd1dbc8 into froyo
* changes:
Project-lib sample: define lib activity.
Switch from codename Froyo to API 8.
Christopher Tate [Mon, 5 Apr 2010 18:06:35 +0000 (11:06 -0700)]
Backup/Restore sample application
A very simple application: one activity, with a few bits of persistent data that
are updated live by the activity. To that are added a few alternative agent
implementations, to illustrate various approaches and tradeoffs when implementing
a backup/restore agent. In particular, there are example agents that do everything
"by hand," either record-by-record or by directly backing up the app's entire
persistent data file; plus an example agent that illustrates how very easy it
is to implement the latter using the OS-provided helpers.
Part of bug #
2545514
Change-Id: Iaca33a5113406360c23d6e2e59eb012f9f1e9400
Xavier Ducrohet [Tue, 6 Apr 2010 21:16:01 +0000 (14:16 -0700)]
am
254f0e9b: Update SDK component source.properties.
Merge commit '
254f0e9bf7595d66b4b7e834636cf7646b972608' into froyo-plus-aosp
* commit '
254f0e9bf7595d66b4b7e834636cf7646b972608':
Update SDK component source.properties.
Raphael [Tue, 6 Apr 2010 20:10:57 +0000 (13:10 -0700)]
Project-lib sample: define lib activity.
This was removed by mistake. I meant to add explanations.
Change-Id: I3641b7c01a1425ab5430695ac83ca71c9fc644d8
Raphael [Tue, 6 Apr 2010 20:09:44 +0000 (13:09 -0700)]
Switch from codename Froyo to API 8.
Change-Id: Ibdd1dbc80e5e7d9856a90ff45a3b148a5af72581
Xavier Ducrohet [Tue, 6 Apr 2010 20:09:37 +0000 (13:09 -0700)]
Update SDK component source.properties.
Change-Id: I2688117f63fe4d9b2d7f8ce220d907fc7ea95ba4
Brett Chabot [Mon, 5 Apr 2010 23:51:13 +0000 (16:51 -0700)]
am
79a612b2: Remove com.android.quicksearchbox.tests from continuous.
Merge commit '
79a612b2ad76cee2d8e11dcf87b0ce45b0056785' into froyo-plus-aosp
* commit '
79a612b2ad76cee2d8e11dcf87b0ce45b0056785':
Remove com.android.quicksearchbox.tests from continuous.
Brett Chabot [Mon, 5 Apr 2010 23:37:59 +0000 (16:37 -0700)]
Remove com.android.quicksearchbox.tests from continuous.
Bug
2562721
Change-Id: Ic8c582cb1f18f8e733c6bd2ced146066d50ca47e
Raphael [Mon, 5 Apr 2010 23:14:11 +0000 (16:14 -0700)]
am
1fd241b3: Merge "Project-lib sample: externalize strings in lib." into froyo
Merge commit '
1fd241b381c61e1068625de0a22bd7d9bb6257b8' into froyo-plus-aosp
* commit '
1fd241b381c61e1068625de0a22bd7d9bb6257b8':
Project-lib sample: externalize strings in lib.
Raphael [Mon, 5 Apr 2010 23:14:08 +0000 (16:14 -0700)]
am
4ce5771c: Merge "Project-lib sample: set namespace to com.example.android" into froyo
Merge commit '
4ce5771ce7460bb7d29b4151512d1a7811499dfe' into froyo-plus-aosp
* commit '
4ce5771ce7460bb7d29b4151512d1a7811499dfe':
Project-lib sample: set namespace to com.example.android
Raphael [Mon, 5 Apr 2010 23:14:06 +0000 (16:14 -0700)]
am
c45224b4: Merge "Implementation of the tic-tac-toe sample." into froyo
Merge commit '
c45224b4252e48f68239e4610811ac1afe41ad71' into froyo-plus-aosp
* commit '
c45224b4252e48f68239e4610811ac1afe41ad71':
Implementation of the tic-tac-toe sample.
Raphael [Mon, 5 Apr 2010 23:14:03 +0000 (16:14 -0700)]
am
6cb5d6a4: Merge "Skeleton for tic-tac-toe sample." into froyo
Merge commit '
6cb5d6a40b01808a5a09670910790ce01c527eda' into froyo-plus-aosp
* commit '
6cb5d6a40b01808a5a09670910790ce01c527eda':
Skeleton for tic-tac-toe sample.
Raphael [Mon, 5 Apr 2010 23:07:20 +0000 (16:07 -0700)]
Merge "Project-lib sample: externalize strings in lib." into froyo
Raphael [Mon, 5 Apr 2010 23:07:11 +0000 (16:07 -0700)]
Merge "Project-lib sample: set namespace to com.example.android" into froyo
Raphael [Mon, 5 Apr 2010 23:07:02 +0000 (16:07 -0700)]
Merge "Implementation of the tic-tac-toe sample." into froyo
Raphael [Mon, 5 Apr 2010 23:06:51 +0000 (16:06 -0700)]
Merge "Skeleton for tic-tac-toe sample." into froyo
Raphael [Mon, 5 Apr 2010 21:54:18 +0000 (14:54 -0700)]
Project-lib sample: externalize strings in lib.
Change-Id: I5fff488ab96f1e28942143330c69370f2009e691
Raphael [Mon, 5 Apr 2010 21:25:50 +0000 (14:25 -0700)]
Project-lib sample: set namespace to com.example.android
This is a pure namespace refactoring change.
Change-Id: I33f5998f876cdc9893d8d45983422ca0e331b3c4
Raphael [Sat, 3 Apr 2010 05:05:14 +0000 (22:05 -0700)]
Implementation of the tic-tac-toe sample.
Added some README.txt
Change-Id: Ie2703ffdfdeba773d0fd27153ec0cdb806b2e2dc
Brett Chabot [Mon, 5 Apr 2010 19:49:15 +0000 (12:49 -0700)]
am
8c63b97f: Rename framework-common testdef to android-common.
Merge commit '
8c63b97f83ac1ac687579286437e0f55c3b267c1' into froyo-plus-aosp
* commit '
8c63b97f83ac1ac687579286437e0f55c3b267c1':
Rename framework-common testdef to android-common.
Brett Chabot [Mon, 5 Apr 2010 19:19:17 +0000 (12:19 -0700)]
Rename framework-common testdef to android-common.
Change-Id: I71717dd874cd3ed82415d110c745dc68e0922838
Raphael [Fri, 2 Apr 2010 06:39:30 +0000 (23:39 -0700)]
Skeleton for tic-tac-toe sample.
Change-Id: I41e7013d469cb2eba9f475aa0a94c4630cacbb64
Brett Chabot [Fri, 2 Apr 2010 17:28:33 +0000 (10:28 -0700)]
am
452de9c9: Merge "More test_defs cleanup." into froyo
Merge commit '
452de9c984b7a21a2208834260a9bb6ce1b0d1a2' into froyo-plus-aosp
* commit '
452de9c984b7a21a2208834260a9bb6ce1b0d1a2':
More test_defs cleanup.
Brett Chabot [Fri, 2 Apr 2010 17:24:15 +0000 (10:24 -0700)]
Merge "More test_defs cleanup." into froyo
Brett Chabot [Fri, 2 Apr 2010 15:50:02 +0000 (08:50 -0700)]
More test_defs cleanup.
Remove obsolete defs, fix browser def, and add framework common tests to
continuous.
Bug
2562721
Change-Id: I41457db7ad6fb460a61429ba686b778d9cf1fa35
Brett Chabot [Fri, 2 Apr 2010 04:49:57 +0000 (21:49 -0700)]
am
d6aae2e8: Merge "Cleanup framework test defs." into froyo
Merge commit '
d6aae2e84b337bb887cf5fcc21b613a4d4151eb6' into froyo-plus-aosp
* commit '
d6aae2e84b337bb887cf5fcc21b613a4d4151eb6':
Cleanup framework test defs.
Brett Chabot [Fri, 2 Apr 2010 04:45:59 +0000 (21:45 -0700)]
Merge "Cleanup framework test defs." into froyo
Brett Chabot [Fri, 2 Apr 2010 01:38:31 +0000 (18:38 -0700)]
Cleanup framework test defs.
Remove obsolete framework test definitions. Reorganize to keep all the framework
tests together.
Bug
2562721
Change-Id: Ic96d52dc081eb28f5354954d3d111a77dc1d8db9
Ying Wang [Fri, 2 Apr 2010 00:42:53 +0000 (17:42 -0700)]
am
a1c8fb11: Merge "Move potentially blocking operation out of the activity controller." into froyo
Merge commit '
a1c8fb11b2008d57f78e4ae35ec87203bda9b8d4' into froyo-plus-aosp
* commit '
a1c8fb11b2008d57f78e4ae35ec87203bda9b8d4':
Move potentially blocking operation out of the activity controller.
Dan Egnor [Fri, 2 Apr 2010 00:42:51 +0000 (17:42 -0700)]
am
112ffc76: Remove BugReportSender, which has a happy new home in packages/experimental
Merge commit '
112ffc7662113c68b77f97c03a4a79f640d5eca7' into froyo-plus-aosp
* commit '
112ffc7662113c68b77f97c03a4a79f640d5eca7':
Remove BugReportSender, which has a happy new home in packages/experimental
Ying Wang [Fri, 2 Apr 2010 00:07:08 +0000 (17:07 -0700)]
Merge "Move potentially blocking operation out of the activity controller." into froyo
Dan Egnor [Thu, 1 Apr 2010 23:39:31 +0000 (16:39 -0700)]
Remove BugReportSender, which has a happy new home in packages/experimental
Change-Id: I97628264f3249c86d83cded73daf3b1cc291e051
OSDN Git Service
