OSDN Git Service
The Android Automerger [Fri, 6 Nov 2009 16:19:28 +0000 (08:19 -0800)]
Merge branch 'eclair' into eclair-release
Android Git Automerger [Fri, 6 Nov 2009 02:22:59 +0000 (18:22 -0800)]
ERC36C
Android Git Automerger [Thu, 5 Nov 2009 21:35:08 +0000 (13:35 -0800)]
ERD36B
Android (Google) Code Review [Thu, 5 Nov 2009 19:15:58 +0000 (14:15 -0500)]
Merge change I7397e6fe into eclair
* changes:
add the new accounts and sync package to the generic target and enable sync for all builds
The Android Automerger [Thu, 5 Nov 2009 16:42:38 +0000 (08:42 -0800)]
ERD36
Android Git Automerger [Thu, 5 Nov 2009 00:03:58 +0000 (16:03 -0800)]
ERD35B
The Android Automerger [Wed, 4 Nov 2009 16:42:46 +0000 (08:42 -0800)]
ERD35
The Android Automerger [Wed, 4 Nov 2009 16:42:26 +0000 (08:42 -0800)]
Merge branch 'eclair' into eclair-release
Scott Main [Wed, 4 Nov 2009 03:04:40 +0000 (19:04 -0800)]
am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
3f7d1df12938b6db9849b03c05d5a56784ee147b' into eclair
* commit '
3f7d1df12938b6db9849b03c05d5a56784ee147b':
docs: revise resizing scripts to better organize the
Android Git Automerger [Wed, 4 Nov 2009 01:42:36 +0000 (17:42 -0800)]
ERD34B
Fred Quintana [Tue, 3 Nov 2009 23:04:59 +0000 (15:04 -0800)]
add the new accounts and sync package to the generic target and enable sync for all builds
The Android Automerger [Tue, 3 Nov 2009 21:36:01 +0000 (13:36 -0800)]
ERD34
The Android Automerger [Tue, 3 Nov 2009 21:35:35 +0000 (13:35 -0800)]
Merge branch 'eclair' into eclair-release
Scott Main [Mon, 2 Nov 2009 23:31:04 +0000 (15:31 -0800)]
docs: revise resizing scripts to better organize the
tasks into chunks that are only executed when necessary.
Move the stuff that does the reference panel resizing
into a separate method because this should only happen when
literally resizing the panels. This thus resolves the problem
in which an invalid cookie would sometimes be written during
a normal window resize event -- there's no need to write that
cookie unless the user literally resizes the panel.
There's no need to call resizeWidth all the time, the doc-content
div can manage its width by inheritence and should only ever have
to resize its left margin when the side nav is manually resized or
when the page is loaded (in order to account for a saved side nav
width). This vastly improves the performance and visual quality
when resizing. However, IE6 still requires this in order for the scrollbars
to be visible in the content area. So a flag is now set when IE6 is
the browser, it has its own onresize method
and the width is defined only for IE6.
Inside resizeHeight, check what the href path is before doing any
resizing, just to make sure we don't do unecessary work and to
make the code more readable.
Scott Main [Tue, 3 Nov 2009 02:40:23 +0000 (18:40 -0800)]
am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
64b879ac5bbabe0489869f76b3a20f26aca6ce22' into eclair
* commit '
64b879ac5bbabe0489869f76b3a20f26aca6ce22':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:05:41 +0000 (18:05 -0800)]
docs: fix js error when there's no api level cookie saved.
currently, if there's no api level cookie saved, then
the selectedLevelItem variable will be undefined and will
throw an error at the end of the buildApilevelSelector function.
Now, userApiLevel is set to the max level in this case.
The Android Automerger [Tue, 3 Nov 2009 00:20:32 +0000 (16:20 -0800)]
ERD33C
The Android Automerger [Mon, 2 Nov 2009 23:24:22 +0000 (15:24 -0800)]
ERD33B
The Android Automerger [Mon, 2 Nov 2009 16:55:56 +0000 (08:55 -0800)]
ERD33
The Android Automerger [Fri, 30 Oct 2009 23:36:24 +0000 (16:36 -0700)]
ERD30B
The Android Automerger [Fri, 30 Oct 2009 23:16:11 +0000 (16:16 -0700)]
Merge branch 'eclair' into eclair-release
Scott Main [Fri, 30 Oct 2009 22:04:17 +0000 (15:04 -0700)]
am
8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '
8e44ae9c762785d80e54bc75e2ba353f486414ec' into eclair
* commit '
8e44ae9c762785d80e54bc75e2ba353f486414ec':
docs: fix IE6 bug in which tabs are not focusable
Scott Main [Fri, 30 Oct 2009 20:33:39 +0000 (13:33 -0700)]
docs: fix IE6 bug in which tabs are not focusable
while in the reference. also increase the minimum
width for the header to avoid line-wrapping of the tabs.
The Android Automerger [Fri, 30 Oct 2009 16:45:55 +0000 (09:45 -0700)]
ERD30
The Android Automerger [Fri, 30 Oct 2009 01:38:38 +0000 (18:38 -0700)]
ERD29D
The Android Automerger [Thu, 29 Oct 2009 21:45:53 +0000 (14:45 -0700)]
ERD29C
The Android Automerger [Thu, 29 Oct 2009 15:27:40 +0000 (08:27 -0700)]
ERD29B
The Android Automerger [Thu, 29 Oct 2009 07:07:09 +0000 (00:07 -0700)]
ERD29
The Android Automerger [Thu, 29 Oct 2009 06:57:17 +0000 (23:57 -0700)]
ERD28B
The Android Automerger [Wed, 28 Oct 2009 16:26:49 +0000 (09:26 -0700)]
ERD28
The Android Automerger [Wed, 28 Oct 2009 16:26:07 +0000 (09:26 -0700)]
Merge branch 'eclair' into eclair-release
Scott Main [Wed, 28 Oct 2009 00:39:37 +0000 (17:39 -0700)]
am
9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit '
9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7' into eclair
* commit '
9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7':
docs: add checkbox to toggle the api level filter on and off;
Scott Main [Tue, 27 Oct 2009 22:09:15 +0000 (15:09 -0700)]
docs: add checkbox to toggle the api level filter on and off;
this includes some function renaming for the related scripts.
the checkbox will be unchecked by default, so any users
that currently have an api level filter selected will now
see all apis until they click the checkbox. the old api level
cookie is still saved the same, but the selected value will only
be applied if the checkbox is selected, which has its own cookie
for on or off.
The Android Automerger [Tue, 27 Oct 2009 15:10:39 +0000 (08:10 -0700)]
ERD27
The Android Automerger [Tue, 27 Oct 2009 15:10:03 +0000 (08:10 -0700)]
Merge branch 'eclair' into eclair-release
Dianne Hackborn [Fri, 23 Oct 2009 19:17:45 +0000 (12:17 -0700)]
Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
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.
OSDN Git Service
