OSDN Git Service
Xavier Ducrohet [Wed, 26 May 2010 20:52:59 +0000 (13:52 -0700)]
am
6e6c1ebd: (-s ours) am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Merge commit '
6e6c1ebd77a6a353bf2af77035c73c606311d8c3' into kraken
* commit '
6e6c1ebd77a6a353bf2af77035c73c606311d8c3':
Move the rev of the froyo sdk component to 2. Do not merge
Xavier Ducrohet [Wed, 26 May 2010 20:51:54 +0000 (13:51 -0700)]
am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Merge commit '
02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7' into froyo-plus-aosp
* commit '
02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7':
Move the rev of the froyo sdk component to 2. Do not merge
Xavier Ducrohet [Wed, 26 May 2010 20:47:19 +0000 (13:47 -0700)]
Move the rev of the froyo sdk component to 2. Do not merge
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
Dirk Dougherty [Mon, 24 May 2010 17:25:09 +0000 (10:25 -0700)]
am
d43be56d: am
3c19d0e0: Doc change: increment androidappdocs version.
Merge commit '
d43be56d40a813bedf96203c4b58056c6139eec0' into kraken
* commit '
d43be56d40a813bedf96203c4b58056c6139eec0':
Doc change: increment androidappdocs version.
Dirk Dougherty [Mon, 24 May 2010 17:23:08 +0000 (10:23 -0700)]
am
3c19d0e0: Doc change: increment androidappdocs version.
Merge commit '
3c19d0e052fae5f21f8e8592143a24919b106743' into froyo-plus-aosp
* commit '
3c19d0e052fae5f21f8e8592143a24919b106743':
Doc change: increment androidappdocs version.
Dirk Dougherty [Mon, 24 May 2010 17:17:06 +0000 (10:17 -0700)]
Doc change: increment androidappdocs version.
Change-Id: Ifd517ed5c51cb95fdc4cc83d5521242086d59534
Andy McFadden [Fri, 21 May 2010 17:58:40 +0000 (10:58 -0700)]
Sim fixes.
Pulled a fix to the simulator app ("long" is 64-bit when 32-bit was
needed) from master. sim-eng is useful for verifying the x86 SMP stuff.
Also quieted a compiler warning.
Change-Id: I399ea4923b7e0650d5f995e056c751374b057fbd
The Android Open Source Project [Wed, 19 May 2010 15:18:13 +0000 (08:18 -0700)]
am
ca81fb41: merge from open-source master
Merge commit '
ca81fb411afd93378f01e3e13ef482693fd35a73' into kraken
* commit '
ca81fb411afd93378f01e3e13ef482693fd35a73':
Corrected StatusBarNotificationSample
The Android Open Source Project [Wed, 19 May 2010 15:13:51 +0000 (08:13 -0700)]
merge from open-source master
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
Guang Zhu [Wed, 19 May 2010 01:44:16 +0000 (18:44 -0700)]
Merge "code coverage improvement (DO NOT MERGE)" into kraken
Dianne Hackborn [Wed, 19 May 2010 01:33:05 +0000 (18:33 -0700)]
Small fix to surface window sample.
Change-Id: Iaae90aaf8cfdb71c6201eba8a436450a75b2b732
Christian Mehlmauer [Tue, 18 May 2010 21:44:32 +0000 (23:44 +0200)]
Corrected StatusBarNotificationSample
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
Dianne Hackborn [Tue, 18 May 2010 19:21:39 +0000 (12:21 -0700)]
Merge "Add new demo of taking over a window's surface." into kraken
The Android Open Source Project [Tue, 18 May 2010 17:59:19 +0000 (10:59 -0700)]
am
253290a7: merge from open-source master
Merge commit '
253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b' into kraken
* commit '
253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b':
Removed bad BuildPaths (not existing Directories after checkout)
The Android Open Source Project [Tue, 18 May 2010 17:56:24 +0000 (10:56 -0700)]
merge from open-source master
Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41
Guang Zhu [Thu, 15 Apr 2010 17:48:26 +0000 (10:48 -0700)]
code coverage improvement (DO NOT MERGE)
* automatically detect if emma is on device
* build emma into libcore if necessary
* stop runtime before adb sync and restart afterwards
Change-Id: Id5087fdd6c0345f2b9b76658a5083b9260af061e
Dianne Hackborn [Mon, 10 May 2010 18:30:38 +0000 (11:30 -0700)]
Add new demo of taking over a window's surface.
Change-Id: If76f577d2a314018d7dc7980ffa446b7cf050037
The Android Open Source Project [Tue, 18 May 2010 16:31:32 +0000 (09:31 -0700)]
am
c043a97c: merge from open-source master
Merge commit '
c043a97c9f3e1a2c8b5a95df70b89c711a1087ce' into kraken
* commit '
c043a97c9f3e1a2c8b5a95df70b89c711a1087ce':
Removed Calls to deprecated API
Removed Duplicate Build Paths
The Android Open Source Project [Tue, 18 May 2010 16:27:19 +0000 (09:27 -0700)]
merge from open-source master
Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87
Christian Mehlmauer [Tue, 18 May 2010 04:53:36 +0000 (06:53 +0200)]
Removed bad BuildPaths (not existing Directories after checkout)
Change-Id: Ia21cb1927dfc8851f728ef3a2175cbdf701f7641
Jean-Baptiste Queru [Mon, 17 May 2010 22:02:56 +0000 (15:02 -0700)]
Merge "Removed Duplicate Build Paths"
Christian Mehlmauer [Mon, 17 May 2010 18:36:01 +0000 (20:36 +0200)]
Removed Calls to deprecated API
Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c
Christian Mehlmauer [Sun, 16 May 2010 20:46:34 +0000 (22:46 +0200)]
Removed Duplicate Build Paths
Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
The Android Open Source Project [Wed, 12 May 2010 16:36:11 +0000 (09:36 -0700)]
am
99096976: merge from open-source master
Merge commit '
99096976d0ed8436c0eacdefae0ffb606bd573c5' into kraken
* commit '
99096976d0ed8436c0eacdefae0ffb606bd573c5':
Added missing --pct-syskeys to processOptions in Monkey
The Android Open Source Project [Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)]
merge from open-source master
Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349
Dirk Dougherty [Tue, 11 May 2010 17:23:32 +0000 (10:23 -0700)]
am
8bfa91f0: am
56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Merge commit '
8bfa91f076b667223920d8b68c8ab0f6e8dbc164' into kraken
* commit '
8bfa91f076b667223920d8b68c8ab0f6e8dbc164':
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Dirk Dougherty [Tue, 11 May 2010 17:18:43 +0000 (10:18 -0700)]
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.
Johan Alfven [Tue, 11 May 2010 07:05:28 +0000 (09:05 +0200)]
Added missing --pct-syskeys to processOptions in Monkey
According to the developer guidelines
http://developer.android.com/guide/developing/tools/monkey.html
it should be possible to run monkey with option --pct-syskeys <percent>
to adjust percentage of "system" key events. (These are keys that are
generally reserved for use by the system, such as Home, Back,
Start Call, End Call, or Volume controls.) However, when trying
to run monkey with that option it fails with:
** Error: Unknown option: --pct-syskeys
The function processOptions in file Monkey.java was missing the
option --pct-syskeys.
Change-Id: I5d328fc93dfe67ed7a905735d6762c7f91c69838
Dirk Dougherty [Sun, 9 May 2010 00:15:10 +0000 (17:15 -0700)]
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
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.