OSDN Git Service
The Android Automerger [Tue, 27 Oct 2009 15:10:03 +0000 (08:10 -0700)]
Merge branch 'eclair' into eclair-release
Android Git Automerger [Mon, 26 Oct 2009 22:58:05 +0000 (15:58 -0700)]
ERD26C
Scott Main [Mon, 26 Oct 2009 22:41:42 +0000 (15:41 -0700)]
am
f1bac52f: fix search for offline docs. again.
Merge commit '
f1bac52fe28ba503c63c929d9d0711671273635f' into eclair
* commit '
f1bac52fe28ba503c63c929d9d0711671273635f':
fix search for offline docs. again.
Scott Main [Mon, 26 Oct 2009 21:44:48 +0000 (14:44 -0700)]
fix search for offline docs. again.
The Android Open Source Project [Mon, 26 Oct 2009 18:37:21 +0000 (11:37 -0700)]
ERD26B
The Android Open Source Project [Mon, 26 Oct 2009 18:37:08 +0000 (11:37 -0700)]
Merge branch 'eclair' into eclair-release
Dirk Dougherty [Mon, 26 Oct 2009 18:18:47 +0000 (11:18 -0700)]
am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259' into eclair
* commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259':
doc change: include SDK Tools in notice to 1.6 developers.
The Android Open Source Project [Mon, 26 Oct 2009 15:41:58 +0000 (08:41 -0700)]
ERD26
The Android Open Source Project [Mon, 26 Oct 2009 15:41:22 +0000 (08:41 -0700)]
Merge branch 'eclair' into eclair-release
Dirk Dougherty [Sat, 24 Oct 2009 21:38:58 +0000 (14:38 -0700)]
doc change: include SDK Tools in notice to 1.6 developers.
Bug:
2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
Scott Main [Sat, 24 Oct 2009 04:04:02 +0000 (21:04 -0700)]
am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef' into eclair
* commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 00:00:25 +0000 (17:00 -0700)]
am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
0d8872e6f2462a947c1543b88a7a353072b808e3' into eclair
* commit '
0d8872e6f2462a947c1543b88a7a353072b808e3':
docs: change javascript so that SDK docs that are not
Scott Main [Fri, 23 Oct 2009 23:19:37 +0000 (16:19 -0700)]
docs: implement sdk announcement in a collapsible box
and revise the 'special' box color and add rounded corners.
Scott Main [Fri, 23 Oct 2009 20:04:31 +0000 (13:04 -0700)]
docs: change javascript so that SDK docs that are not
listed in the left nav do not highlight parent index documents
Scott Main [Fri, 23 Oct 2009 20:02:29 +0000 (13:02 -0700)]
am
60dba894: docs: add eclair logo for homepage
Merge commit '
60dba89451e4ee489720436a9a3f3de4823da7d2' into eclair
* commit '
60dba89451e4ee489720436a9a3f3de4823da7d2':
docs: add eclair logo for homepage
Scott Main [Fri, 23 Oct 2009 19:22:42 +0000 (12:22 -0700)]
docs: add eclair logo for homepage
The Android Open Source Project [Fri, 23 Oct 2009 15:45:47 +0000 (08:45 -0700)]
ERD23
The Android Open Source Project [Fri, 23 Oct 2009 15:45:20 +0000 (08:45 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Thu, 22 Oct 2009 21:04:56 +0000 (17:04 -0400)]
Merge change I3fb149d2 into eclair
* changes:
Remove 'cd top' step from envsetup runtest shortcut.
Dirk Dougherty [Thu, 22 Oct 2009 18:22:00 +0000 (11:22 -0700)]
am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
3d3d7b7efd755d13c7e70f01b1ba00ba0742a354' into eclair
* commit '
3d3d7b7efd755d13c7e70f01b1ba00ba0742a354':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:51 +0000 (11:21 -0700)]
am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
fce6b45f629e59b79beed1c18486530c00769bbf' into eclair
* commit '
fce6b45f629e59b79beed1c18486530c00769bbf':
doc change: template/asset changes for sdk package.
The Android Open Source Project [Thu, 22 Oct 2009 15:30:32 +0000 (08:30 -0700)]
ERD22
The Android Open Source Project [Thu, 22 Oct 2009 15:30:20 +0000 (08:30 -0700)]
Merge branch 'eclair' into eclair-release
Brett Chabot [Thu, 22 Oct 2009 03:05:26 +0000 (20:05 -0700)]
Remove 'cd top' step from envsetup runtest shortcut.
Instead, execute runtest as an absolute path. Ths is necessary to support
relative path based arguments in runtest. Bug
2133198
Dirk Dougherty [Thu, 22 Oct 2009 02:52:52 +0000 (19:52 -0700)]
doc change: template changes for new SDK doc structure.
Bug:
2160782
The Android Open Source Project [Wed, 21 Oct 2009 16:02:02 +0000 (09:02 -0700)]
ERD21
The Android Open Source Project [Wed, 21 Oct 2009 16:01:49 +0000 (09:01 -0700)]
Merge branch 'eclair' into eclair-release
Owen Lin [Fri, 16 Oct 2009 09:43:05 +0000 (02:43 -0700)]
Add OVERRIDE_PACKAGES support for prebuild modules.
So that some prebuild module can override existing packages.
Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
Android (Google) Code Review [Wed, 21 Oct 2009 02:28:45 +0000 (22:28 -0400)]
Merge change Ied29246e into eclair
* changes:
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Brandon Ballinger [Wed, 21 Oct 2009 00:41:16 +0000 (17:41 -0700)]
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Android (Google) Code Review [Tue, 20 Oct 2009 20:28:14 +0000 (16:28 -0400)]
Merge change I5e98e6f0 into eclair
* changes:
use aapt to build jar files instead of the system zip (DO NOT MERGE)
The Android Open Source Project [Tue, 20 Oct 2009 15:45:41 +0000 (08:45 -0700)]
ERD20
Owen Lin [Thu, 15 Oct 2009 09:09:18 +0000 (02:09 -0700)]
Add package Gallery into default build.
Change-Id: Ia4447fdb6c4c26a5419ef59cc9d8276838a95854
Doug Zongker [Tue, 20 Oct 2009 00:05:46 +0000 (17:05 -0700)]
use aapt to build jar files instead of the system zip (DO NOT MERGE)
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
The Android Open Source Project [Mon, 19 Oct 2009 16:17:08 +0000 (09:17 -0700)]
ERD19B
The Android Open Source Project [Mon, 19 Oct 2009 15:59:48 +0000 (08:59 -0700)]
ERD19
Dirk Dougherty [Sat, 17 Oct 2009 00:14:33 +0000 (17:14 -0700)]
doc change: template/asset changes for sdk package.
The Android Open Source Project [Fri, 16 Oct 2009 18:12:50 +0000 (11:12 -0700)]
ERD16
The Android Open Source Project [Thu, 15 Oct 2009 15:39:33 +0000 (08:39 -0700)]
ERD15
The Android Open Source Project [Thu, 15 Oct 2009 00:15:53 +0000 (17:15 -0700)]
ERD14B
The Android Open Source Project [Wed, 14 Oct 2009 15:46:57 +0000 (08:46 -0700)]
ERD14
The Android Open Source Project [Wed, 14 Oct 2009 02:27:21 +0000 (19:27 -0700)]
ERD13B
The Android Open Source Project [Tue, 13 Oct 2009 20:40:29 +0000 (13:40 -0700)]
ERD13
The Android Open Source Project [Tue, 13 Oct 2009 20:40:13 +0000 (13:40 -0700)]
Merge branch 'eclair' into eclair-release
The Android Open Source Project [Tue, 13 Oct 2009 02:34:42 +0000 (19:34 -0700)]
ERD12B
The Android Open Source Project [Tue, 13 Oct 2009 00:56:46 +0000 (17:56 -0700)]
ERD12
Raphael [Mon, 12 Oct 2009 23:16:02 +0000 (16:16 -0700)]
Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
The Android Open Source Project [Sun, 11 Oct 2009 21:13:49 +0000 (14:13 -0700)]
ERD11
The Android Open Source Project [Sat, 10 Oct 2009 19:50:54 +0000 (12:50 -0700)]
ERD10
The Android Open Source Project [Fri, 9 Oct 2009 22:01:41 +0000 (15:01 -0700)]
ERD09
The Android Open Source Project [Fri, 9 Oct 2009 22:01:30 +0000 (15:01 -0700)]
Merge branch 'eclair' into eclair-release
Dianne Hackborn [Fri, 9 Oct 2009 03:50:27 +0000 (20:50 -0700)]
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
We are now 2.0. Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.
Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
The Android Open Source Project [Thu, 8 Oct 2009 21:44:51 +0000 (14:44 -0700)]
ERD08
The Android Open Source Project [Thu, 8 Oct 2009 21:44:38 +0000 (14:44 -0700)]
Merge branch 'eclair' into eclair-release
Brett Chabot [Thu, 8 Oct 2009 17:48:24 +0000 (10:48 -0700)]
am
45dc54f6: Add speech tests to CTS makefile.
Merge commit '
45dc54f680faea12519870db356f84924c00687d' into eclair
* commit '
45dc54f680faea12519870db356f84924c00687d':
Add speech tests to CTS makefile.
Brett Chabot [Thu, 8 Oct 2009 17:48:20 +0000 (10:48 -0700)]
am
30e1f2bd: Add dpi tests to CTS.
Merge commit '
30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair
* commit '
30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
Add dpi tests to CTS.
Brett Chabot [Thu, 17 Sep 2009 01:56:23 +0000 (18:56 -0700)]
Add speech tests to CTS makefile.
Brett Chabot [Thu, 10 Sep 2009 20:35:54 +0000 (13:35 -0700)]
Add dpi tests to CTS.
android-build SharedAccount [Thu, 8 Oct 2009 04:01:11 +0000 (21:01 -0700)]
ERD07B
android-build SharedAccount [Thu, 8 Oct 2009 04:00:31 +0000 (21:00 -0700)]
Merge branch 'eclair' into eclair-release
android-build SharedAccount [Thu, 8 Oct 2009 00:09:43 +0000 (17:09 -0700)]
ERD07
android-build SharedAccount [Thu, 8 Oct 2009 00:08:52 +0000 (17:08 -0700)]
Merge branch 'eclair' into eclair-release
Doug Zongker [Thu, 8 Oct 2009 00:05:36 +0000 (17:05 -0700)]
resolved conflicts for merge of
cfd7db6d to eclair
Doug Zongker [Wed, 7 Oct 2009 18:35:53 +0000 (11:35 -0700)]
move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
Android (Google) Code Review [Wed, 7 Oct 2009 18:05:28 +0000 (14:05 -0400)]
Merge change I6b350185 into eclair
* changes:
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 17:01:13 +0000 (10:01 -0700)]
eng builds only -- make the thing that makes setupwizard optional actually work.
Jeff Hamilton [Wed, 7 Oct 2009 05:30:19 +0000 (00:30 -0500)]
Add a cleanspec rule for the change to bump the API version to 5.
Change-Id: I6b35018552b3a9fc2016f054c8a3c2feb41bc0ad
android-build SharedAccount [Wed, 7 Oct 2009 01:58:23 +0000 (18:58 -0700)]
Merge branch 'eclair' into eclair-release
Dianne Hackborn [Wed, 7 Oct 2009 00:22:49 +0000 (17:22 -0700)]
Part of issue #
2168428: STOP SHIP: Bump API version to 5
This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.
Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
android-build SharedAccount [Tue, 6 Oct 2009 23:16:42 +0000 (16:16 -0700)]
ERD06B
Mike Ritter [Tue, 6 Oct 2009 18:46:36 +0000 (11:46 -0700)]
am
69625548: Merge change I239e9f26 into donut
Merge commit '
69625548bf020685cdcb57dffe8f34aba80f11e5' into eclair
* commit '
69625548bf020685cdcb57dffe8f34aba80f11e5':
Bug in Mac build where it gets confused over case, fix no longer needed.
Android (Google) Code Review [Tue, 6 Oct 2009 18:36:51 +0000 (14:36 -0400)]
Merge change I239e9f26 into donut
* changes:
Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit
e44fadeb49aac9d762f089ee2f23e4a4907a822f)
Android (Google) Code Review [Tue, 6 Oct 2009 17:48:38 +0000 (13:48 -0400)]
Merge change I2bdc7ec9 into eclair
* changes:
Speed up warn.py about 30x by precompiling all the regular expressions.
Android (Google) Code Review [Tue, 6 Oct 2009 17:31:06 +0000 (13:31 -0400)]
Merge change Ib7704386 into eclair
* changes:
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default, and put the commonly used options at the top.
Scott Main [Tue, 6 Oct 2009 17:14:01 +0000 (10:14 -0700)]
am
37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '
37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair
* commit '
37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
docs only.
Scott Main [Tue, 6 Oct 2009 16:05:48 +0000 (09:05 -0700)]
docs only.
fix FF2 browser bug in header layout
http://b/
2031559
Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
android-build SharedAccount [Tue, 6 Oct 2009 16:18:56 +0000 (09:18 -0700)]
ERC06
android-build SharedAccount [Mon, 5 Oct 2009 22:02:13 +0000 (15:02 -0700)]
ERC05
Joe Onorato [Mon, 5 Oct 2009 17:06:25 +0000 (10:06 -0700)]
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
and put the commonly used options at the top.
android-build SharedAccount [Sat, 3 Oct 2009 00:13:42 +0000 (17:13 -0700)]
ERC02
android-build SharedAccount [Fri, 2 Oct 2009 01:27:17 +0000 (18:27 -0700)]
ERC01B
android-build SharedAccount [Thu, 1 Oct 2009 15:49:59 +0000 (08:49 -0700)]
ERD01
android-build SharedAccount [Thu, 1 Oct 2009 15:43:38 +0000 (08:43 -0700)]
Merge commit 'goog/eclair' into eclair-release
Android (Google) Code Review [Thu, 1 Oct 2009 02:58:34 +0000 (22:58 -0400)]
Merge change I57500a81 into eclair
* changes:
Add assets from all density to the SDK system image.
Xavier Ducrohet [Thu, 1 Oct 2009 00:20:11 +0000 (17:20 -0700)]
Add assets from all density to the SDK system image.
Change-Id: I57500a81607edf04337f0a0a75077c00d6d17274
Android (Google) Code Review [Wed, 30 Sep 2009 22:23:08 +0000 (18:23 -0400)]
Merge change I962d468d into eclair
* changes:
revise the deprecated warning to use the 'caution' style and add a line break
android-build SharedAccount [Wed, 30 Sep 2009 22:22:35 +0000 (15:22 -0700)]
ERC92B
Scott Main [Wed, 30 Sep 2009 21:37:32 +0000 (14:37 -0700)]
revise the deprecated warning to use the 'caution'
style and add a line break
Android (Google) Code Review [Wed, 30 Sep 2009 20:20:41 +0000 (16:20 -0400)]
Merge change Ie3f5cd4a into eclair
* changes:
Clean steps for a product configuration change.
Jason Chen [Wed, 30 Sep 2009 19:25:55 +0000 (12:25 -0700)]
Clean steps for a product configuration change.
Cleans up intermediates produced for a prebuilt app
included in some product configurations.
Mike Ritter [Wed, 30 Sep 2009 19:09:19 +0000 (12:09 -0700)]
Bug in Mac build where it gets confused over case, fix no longer needed.
(cherry picked from commit
e44fadeb49aac9d762f089ee2f23e4a4907a822f)
Xavier Ducrohet [Wed, 30 Sep 2009 18:32:13 +0000 (11:32 -0700)]
am
1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '
1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe' into eclair
* commit '
1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe':
Remove kickback/talkback/soundback from SDK.
Dirk Dougherty [Wed, 30 Sep 2009 18:32:09 +0000 (11:32 -0700)]
am
7259bae0: Merge change Ied94685e into donut
Merge commit '
7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '
7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
Doug Zongker [Wed, 30 Sep 2009 16:20:32 +0000 (09:20 -0700)]
remember device-specific releasetools extensions in target-files
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
The Android Open Source Project [Wed, 30 Sep 2009 15:37:42 +0000 (08:37 -0700)]
ERC92
The Android Open Source Project [Wed, 30 Sep 2009 15:37:21 +0000 (08:37 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Xavier Ducrohet [Wed, 30 Sep 2009 01:11:05 +0000 (18:11 -0700)]
Remove kickback/talkback/soundback from SDK.
These apps are not in the AOSP tree and cannot be part of the standard SDK
build.
They are available at http://code.google.com/p/eyes-free/
android-build SharedAccount [Tue, 29 Sep 2009 21:59:34 +0000 (14:59 -0700)]
ERC91B
Android (Google) Code Review [Tue, 29 Sep 2009 18:31:43 +0000 (14:31 -0400)]
Merge change I95ed76bd into eclair
* changes:
Update usage and readme for zipalign.
Andy McFadden [Tue, 29 Sep 2009 17:55:32 +0000 (10:55 -0700)]
Update usage and readme for zipalign.
Added the "-c" flag to the README, and added a short description of the
flag meanings to the usage output. Threw in an AOSP copyright one-liner
for good measure.