OSDN Git Service
android-build SharedAccount [Thu, 17 Dec 2009 21:50:50 +0000 (13:50 -0800)]
Merge branch 'eclair' into eclair-release
android-build SharedAccount [Thu, 17 Dec 2009 06:53:31 +0000 (22:53 -0800)]
ERD77D
android-build SharedAccount [Thu, 17 Dec 2009 06:42:24 +0000 (22:42 -0800)]
ERD77C
Android (Google) Code Review [Thu, 17 Dec 2009 05:38:02 +0000 (21:38 -0800)]
Merge change I92c7fe59 into eclair
* changes:
docs: change DOCTYPE to html5 format
Scott Main [Thu, 17 Dec 2009 05:36:15 +0000 (21:36 -0800)]
docs: change DOCTYPE to html5 format
Scott Main [Wed, 16 Dec 2009 23:36:20 +0000 (15:36 -0800)]
docs for esr: add support for breadcrumbing in the resource docs
android-build SharedAccount [Wed, 16 Dec 2009 21:50:57 +0000 (13:50 -0800)]
ERD77B
android-build SharedAccount [Wed, 16 Dec 2009 15:41:25 +0000 (07:41 -0800)]
ERD77
android-build SharedAccount [Wed, 16 Dec 2009 15:40:36 +0000 (07:40 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Wed, 16 Dec 2009 03:26:48 +0000 (19:26 -0800)]
Merge change Ib471b5b2 into eclair
* changes:
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Dirk Dougherty [Wed, 16 Dec 2009 02:48:38 +0000 (18:48 -0800)]
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Bug:
2160782
Change-Id: Ib471b5b28f599447e77294c8dcc23d24a18c3436
android-build SharedAccount [Tue, 15 Dec 2009 22:19:28 +0000 (14:19 -0800)]
ERD76
android-build SharedAccount [Tue, 15 Dec 2009 22:19:09 +0000 (14:19 -0800)]
Merge branch 'eclair' into eclair-release
Xavier Ducrohet [Tue, 15 Dec 2009 06:37:13 +0000 (22:37 -0800)]
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Change-Id: I5a1b0d2e383b757e52879792ee80dbd61f97f9a4
Android (Google) Code Review [Tue, 15 Dec 2009 02:20:10 +0000 (18:20 -0800)]
Merge change Icb5cf14e into eclair
* changes:
Add feature list support to DroidDoc.
The Android Automerger [Tue, 15 Dec 2009 02:04:41 +0000 (18:04 -0800)]
ERD75
The Android Automerger [Tue, 15 Dec 2009 02:04:14 +0000 (18:04 -0800)]
Merge branch 'eclair' into eclair-release
Xavier Ducrohet [Tue, 15 Dec 2009 01:55:05 +0000 (17:55 -0800)]
Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.
This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)
Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
Xavier Ducrohet [Tue, 15 Dec 2009 00:46:05 +0000 (16:46 -0800)]
Add gallery to the SDK build now that it's split from the Camera app.
Bug:
2275030
Change-Id: Iad74a37d0df1d77185062cb4323665be7185c242
Dirk Dougherty [Thu, 3 Dec 2009 02:01:16 +0000 (18:01 -0800)]
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug:
2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
The Android Automerger [Fri, 11 Dec 2009 21:23:24 +0000 (13:23 -0800)]
ERD72
android-build SharedAccount [Fri, 11 Dec 2009 02:56:46 +0000 (18:56 -0800)]
ERD71F
android-build SharedAccount [Fri, 11 Dec 2009 00:32:57 +0000 (16:32 -0800)]
ERD71E
The Android Automerger [Fri, 11 Dec 2009 00:22:18 +0000 (16:22 -0800)]
ERD71D
android-build SharedAccount [Thu, 10 Dec 2009 19:25:53 +0000 (11:25 -0800)]
ERD71C
The Android Automerger [Thu, 10 Dec 2009 19:17:20 +0000 (11:17 -0800)]
ERD71B
The Android Automerger [Thu, 10 Dec 2009 17:01:57 +0000 (09:01 -0800)]
ERD71
The Android Automerger [Thu, 10 Dec 2009 17:01:32 +0000 (09:01 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Thu, 10 Dec 2009 02:13:09 +0000 (18:13 -0800)]
Merge change I483cf38d into eclair
* changes:
docs: add "figure" class for DIV elements that contain a figure image with caption text.
Scott Main [Thu, 10 Dec 2009 02:08:32 +0000 (18:08 -0800)]
docs: add "figure" class for DIV elements that contain
a figure image with caption text.
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
The Android Automerger [Wed, 9 Dec 2009 22:46:56 +0000 (14:46 -0800)]
ERD70B
Ying Wang [Tue, 8 Dec 2009 02:14:00 +0000 (18:14 -0800)]
Fixes ProGuard options.
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
The Android Automerger [Wed, 9 Dec 2009 16:50:44 +0000 (08:50 -0800)]
ERD70
The Android Automerger [Tue, 8 Dec 2009 16:49:07 +0000 (08:49 -0800)]
ERD69
The Android Automerger [Tue, 8 Dec 2009 16:48:45 +0000 (08:48 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Tue, 8 Dec 2009 00:29:47 +0000 (16:29 -0800)]
Merge change I79580117 into eclair
* changes:
docs: add context coloring to code snippets with prettify script
android-build SharedAccount [Tue, 8 Dec 2009 00:29:16 +0000 (16:29 -0800)]
ERD68B
The Android Automerger [Mon, 7 Dec 2009 16:29:34 +0000 (08:29 -0800)]
ERD68
The Android Automerger [Mon, 7 Dec 2009 16:29:12 +0000 (08:29 -0800)]
Merge branch 'eclair' into eclair-release
Mike Lockwood [Mon, 7 Dec 2009 12:23:25 +0000 (07:23 -0500)]
Add clean step for switching GPS API from pdapi to loc_api
Change-Id: Ifa75b0865b547f5e643a4466f13ec7485e902e5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Fri, 4 Dec 2009 18:36:44 +0000 (10:36 -0800)]
Merge change Id97eba9f into eclair
* changes:
don't add "ota-rel-keys" tag to build fingerprints
The Android Automerger [Fri, 4 Dec 2009 17:24:25 +0000 (09:24 -0800)]
ERD65
The Android Automerger [Fri, 4 Dec 2009 17:24:04 +0000 (09:24 -0800)]
Merge branch 'eclair' into eclair-release
Doug Zongker [Fri, 4 Dec 2009 01:37:37 +0000 (17:37 -0800)]
don't add "ota-rel-keys" tag to build fingerprints
This tag is obsolete; we no longer need to distinguish the OTA keys
from the app keys.
This change does not affect device code.
Android (Google) Code Review [Fri, 4 Dec 2009 00:38:44 +0000 (16:38 -0800)]
Merge change I5ecba70c into eclair
* changes:
add missing comma
Doug Zongker [Fri, 4 Dec 2009 00:36:20 +0000 (16:36 -0800)]
add missing comma
A missing comma is breaking the option parsing for the signing tools
(this doesn't affect any device code, only the signing tools).
The Android Automerger [Thu, 3 Dec 2009 21:41:43 +0000 (13:41 -0800)]
ERD64B
The Android Automerger [Thu, 3 Dec 2009 21:41:22 +0000 (13:41 -0800)]
Merge branch 'eclair' into eclair-release
Ying Wang [Thu, 3 Dec 2009 19:25:47 +0000 (11:25 -0800)]
Overwrite android-info instead of appending to it
if someone changes board-info.txt, then it should be copied out to
out/target/product/<device>/android-info.txt, instead of appending.
Scott Main [Thu, 3 Dec 2009 04:59:40 +0000 (20:59 -0800)]
docs: add context coloring to code snippets with prettify script
The Android Automerger [Thu, 3 Dec 2009 17:17:38 +0000 (09:17 -0800)]
ERD64
android-build SharedAccount [Thu, 3 Dec 2009 01:41:25 +0000 (17:41 -0800)]
ERD63C
android-build SharedAccount [Thu, 3 Dec 2009 00:55:41 +0000 (16:55 -0800)]
ERD63B
The Android Automerger [Wed, 2 Dec 2009 16:50:08 +0000 (08:50 -0800)]
ERD63
The Android Automerger [Wed, 2 Dec 2009 16:49:46 +0000 (08:49 -0800)]
Merge branch 'eclair' into eclair-release
android-build SharedAccount [Tue, 1 Dec 2009 23:47:03 +0000 (15:47 -0800)]
move branch back to ERD62
android-build SharedAccount [Tue, 1 Dec 2009 20:28:08 +0000 (12:28 -0800)]
ERC56C
Android (Google) Code Review [Tue, 1 Dec 2009 20:26:41 +0000 (12:26 -0800)]
Merge change I485df382 into eclair
* changes:
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
The Android Automerger [Tue, 1 Dec 2009 17:06:52 +0000 (09:06 -0800)]
ERD62
The Android Automerger [Tue, 1 Dec 2009 17:06:17 +0000 (09:06 -0800)]
Merge branch 'eclair' into eclair-release
Doug Zongker [Mon, 30 Nov 2009 23:37:14 +0000 (15:37 -0800)]
add 'extras' mechanism to OTA and signing tools
Add the -x option which allows arbitrary key-value pairs to be passed
into the device-specific module for doing signing and OTA packaging.
The Android Automerger [Mon, 30 Nov 2009 16:59:47 +0000 (08:59 -0800)]
ERD61
The Android Automerger [Mon, 30 Nov 2009 16:39:12 +0000 (08:39 -0800)]
Merge branch 'eclair' into eclair-release
Brian Swetland [Wed, 25 Nov 2009 21:43:25 +0000 (13:43 -0800)]
only auto-generate board= requirement if a board-info file is not specified
If a board-info file is specified (as is usually the case) we should honor
its requirements.
android-build SharedAccount [Wed, 25 Nov 2009 21:50:30 +0000 (13:50 -0800)]
ERD56B
Brian Swetland [Wed, 25 Nov 2009 21:43:25 +0000 (13:43 -0800)]
only auto-generate board= requirement if a board-info file is not specified
If a board-info file is specified (as is usually the case) we should honor
its requirements.
android-build SharedAccount [Wed, 25 Nov 2009 20:34:40 +0000 (12:34 -0800)]
ERD56
Dan Bornstein [Tue, 24 Nov 2009 23:48:50 +0000 (15:48 -0800)]
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
This makes runtest, in particular, happier, since it will now find that
its idea of the cwd actually matches with what's claimed in ANDROID_BUILD_TOP.
Change-Id: I485df382d9d314a73b410030bf2116215b6250f9
android-build SharedAccount [Tue, 24 Nov 2009 23:26:01 +0000 (15:26 -0800)]
ERD55B
The Android Automerger [Tue, 24 Nov 2009 17:29:38 +0000 (09:29 -0800)]
ERD55
The Android Automerger [Tue, 24 Nov 2009 17:29:05 +0000 (09:29 -0800)]
Merge branch 'eclair' into eclair-release
Mathias Agopian [Tue, 24 Nov 2009 07:14:44 +0000 (23:14 -0800)]
clean step for build.prop
Scott Main [Mon, 23 Nov 2009 21:02:17 +0000 (13:02 -0800)]
am
1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '
1a177879281ac6ed541a8f875c0130c3355ab6f9' into eclair
* commit '
1a177879281ac6ed541a8f875c0130c3355ab6f9':
droiddoc change: revise the sample code generating script so that
Android (Google) Code Review [Mon, 23 Nov 2009 20:55:36 +0000 (12:55 -0800)]
Merge change I06c40454 into eclair-sdk
* changes:
droiddoc change: revise the sample code generating script so that all the source code pages are NOT generated for the offline version of the docs (only show source in html for online docs).
The Android Automerger [Mon, 23 Nov 2009 17:29:31 +0000 (09:29 -0800)]
ERD54
The Android Automerger [Mon, 23 Nov 2009 17:28:46 +0000 (09:28 -0800)]
Merge branch 'eclair' into eclair-release
Scott Main [Sat, 21 Nov 2009 00:38:47 +0000 (16:38 -0800)]
am
4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '
4cdb7149127d9527411ed73e26604a2cf2292435' into eclair
* commit '
4cdb7149127d9527411ed73e26604a2cf2292435':
docs: change the ADP image for the homepage carousel
Scott Main [Sat, 21 Nov 2009 00:22:14 +0000 (16:22 -0800)]
docs: change the ADP image for the homepage carousel
Change-Id: I6141f32e18918d51d72cfa645f0ceea709002cc6
The Android Automerger [Fri, 20 Nov 2009 23:02:37 +0000 (15:02 -0800)]
ERD51
The Android Automerger [Fri, 20 Nov 2009 23:02:06 +0000 (15:02 -0800)]
Merge branch 'eclair' into eclair-release
Dan Bornstein [Fri, 20 Nov 2009 21:13:41 +0000 (13:13 -0800)]
Add Bluetooth to the test list.
Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
Scott Main [Fri, 20 Nov 2009 18:41:49 +0000 (10:41 -0800)]
droiddoc change: revise the sample code generating script so that
all the source code pages are NOT generated for the offline version
of the docs (only show source in html for online docs).
This won't work until a companion change from framwork/base/Android.mk
is submitted (but shouldn't break the build).
Change-Id: I06c404540870071c2a5a8aa460e156506fd975cb
Scott Main [Fri, 20 Nov 2009 17:55:08 +0000 (09:55 -0800)]
am
91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '
91ed9bbbdce1990782b4ac86650f9c79bb94d961' into eclair
* commit '
91ed9bbbdce1990782b4ac86650f9c79bb94d961':
docs: revise user agent detection to use lower case
Android (Google) Code Review [Fri, 20 Nov 2009 17:38:18 +0000 (09:38 -0800)]
Merge change Id8115ffb into eclair-sdk
* changes:
docs: revise user agent detection to use lower case for string comparisons and add 'webos' as a mobile device
Android (Google) Code Review [Thu, 19 Nov 2009 19:24:29 +0000 (11:24 -0800)]
Merge change Ib5817a3a into eclair
* changes:
sdk doc change for esr: update version refs to 2.0.1.
Android (Google) Code Review [Thu, 19 Nov 2009 18:43:07 +0000 (10:43 -0800)]
Merge change I60b2633b into eclair
* changes:
Add the JNI test to the CTS list.
The Android Automerger [Thu, 19 Nov 2009 18:23:44 +0000 (10:23 -0800)]
ERD50
The Android Automerger [Thu, 19 Nov 2009 18:23:01 +0000 (10:23 -0800)]
Merge branch 'eclair' into eclair-release
Dirk Dougherty [Thu, 19 Nov 2009 07:15:13 +0000 (23:15 -0800)]
sdk doc change for esr: update version refs to 2.0.1.
Bug:
2160782
Android (Google) Code Review [Thu, 19 Nov 2009 02:17:46 +0000 (18:17 -0800)]
Merge change If922a88c into eclair
* changes:
Update version name to 2.1 and API to 7.
Dianne Hackborn [Thu, 19 Nov 2009 01:37:15 +0000 (17:37 -0800)]
Update version name to 2.1 and API to 7.
Change-Id: If922a88c1f3e99553ec5df9b870713eab1c53c54
Dan Bornstein [Thu, 19 Nov 2009 01:18:07 +0000 (17:18 -0800)]
Add the JNI test to the CTS list.
Change-Id: I60b2633b98ccb06551e521ff229ed12c897cc2e6
Raphael [Thu, 19 Nov 2009 01:12:39 +0000 (17:12 -0800)]
am
d920ec83: Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '
d920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair
* commit '
d920ec8354940653e6cf53a1540360cca3bcc5f7':
Fix a Windows-only discrepency in the Windows SDK build.
Raphael [Thu, 19 Nov 2009 01:11:57 +0000 (17:11 -0800)]
am
a62a4421: Fix the Windows SDK build for the development to sdk split.
Merge commit '
a62a442129a28bf3a62139183868a13b91e976ad' into eclair
* commit '
a62a442129a28bf3a62139183868a13b91e976ad':
Fix the Windows SDK build for the development to sdk split.
Xavier Ducrohet [Thu, 19 Nov 2009 01:11:53 +0000 (17:11 -0800)]
am
1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '
1ae988040777f88f766fc421af79a61175e917af' into eclair
* commit '
1ae988040777f88f766fc421af79a61175e917af':
Change where makefile looks for sdk_clean.sh
Scott Main [Thu, 19 Nov 2009 01:11:50 +0000 (17:11 -0800)]
am
9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '
9a5c84020595eac7e20fce036a9afd7c06766457' into eclair
* commit '
9a5c84020595eac7e20fce036a9afd7c06766457':
docs: make all javadoc reference links use <code>
Brett Chabot [Thu, 12 Nov 2009 21:29:07 +0000 (13:29 -0800)]
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Bug
2099347
Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
Raphael [Wed, 18 Nov 2009 22:16:04 +0000 (14:16 -0800)]
Fix a Windows-only discrepency in the Windows SDK build.
For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.
Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
The Android Automerger [Wed, 18 Nov 2009 16:49:45 +0000 (08:49 -0800)]
ERD49
The Android Automerger [Wed, 18 Nov 2009 16:48:12 +0000 (08:48 -0800)]
Merge branch 'eclair' into eclair-release
OSDN Git Service
