OSDN Git Service
Mike Reed [Fri, 6 Nov 2009 19:24:37 +0000 (11:24 -0800)]
am
65a731b7: Merge change I8dd26ee4 into eclair-mr2
Merge commit '
65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp
* commit '
65a731b737bd6e8afa0b18176064dcc130dbb4ce':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
Android (Google) Code Review [Fri, 6 Nov 2009 19:16:37 +0000 (14:16 -0500)]
Merge change I8dd26ee4 into eclair-mr2
* changes:
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
Fred Quintana [Thu, 5 Nov 2009 19:49:53 +0000 (11:49 -0800)]
am
aa82f8ee: am
357f5bc8: Merge change I7397e6fe into eclair
Merge commit '
aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp
* commit '
aa82f8ee8f747e4466f3f6754201765a2b5b3707':
add the new accounts and sync package to the generic target and enable sync for all builds
Fred Quintana [Thu, 5 Nov 2009 19:23:44 +0000 (11:23 -0800)]
am
357f5bc8: Merge change I7397e6fe into eclair
Merge commit '
357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2
* commit '
357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
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
Steve Block [Thu, 5 Nov 2009 07:33:28 +0000 (23:33 -0800)]
am
5243b109: WebKit clean required by move of V8 to external/v8.
Merge commit '
5243b109acec2b03431aef36ccc42256b77ae316' into eclair-mr2-plus-aosp
* commit '
5243b109acec2b03431aef36ccc42256b77ae316':
WebKit clean required by move of V8 to external/v8.
Steve Block [Tue, 3 Nov 2009 21:10:45 +0000 (21:10 +0000)]
WebKit clean required by move of V8 to external/v8.
Change-Id: Idc425e143c928a7da39af9a002705699e3e12901
Scott Main [Wed, 4 Nov 2009 03:22:34 +0000 (19:22 -0800)]
am
747f2997: am
24fbbfaa: am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
747f2997f1ddeac97090ce1d94d04eed9cffc529' into eclair-mr2-plus-aosp
* commit '
747f2997f1ddeac97090ce1d94d04eed9cffc529':
docs: revise resizing scripts to better organize the
Scott Main [Wed, 4 Nov 2009 03:12:40 +0000 (19:12 -0800)]
am
24fbbfaa: am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-mr2
* commit '
24fbbfaa80ce17481e695c001b66c0176b8f0f00':
docs: revise resizing scripts to better organize the
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
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
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:59:08 +0000 (18:59 -0800)]
am
4d3aa886: am
ec4194ef: am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
4d3aa886dbafcc76e0a5fa6b947a98395beb836e' into eclair-mr2-plus-aosp
* commit '
4d3aa886dbafcc76e0a5fa6b947a98395beb836e':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:50:09 +0000 (18:50 -0800)]
am
ec4194ef: am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-mr2
* commit '
ec4194ef1baa2906f916a01e368bb5d6805ba245':
docs: fix js error when there's no api level cookie saved.
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.
Scott Main [Fri, 30 Oct 2009 22:25:01 +0000 (15:25 -0700)]
am
3f08740b: am
32b505d9: 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 '
3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348' into eclair-mr2-plus-aosp
* commit '
3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348':
docs: fix IE6 bug in which tabs are not focusable
Scott Main [Fri, 30 Oct 2009 22:15:14 +0000 (15:15 -0700)]
am
32b505d9: 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 '
32b505d984ed15156b87482f849b865892b57ac2' into eclair-mr2
* commit '
32b505d984ed15156b87482f849b865892b57ac2':
docs: fix IE6 bug in which tabs are not focusable
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.
Mike Reed [Fri, 30 Oct 2009 12:32:28 +0000 (08:32 -0400)]
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
i.e. if NDEBUG is defined, then SK_RELEASE will get defined in the skia config headers
Dan Egnor [Thu, 29 Oct 2009 20:15:33 +0000 (13:15 -0700)]
am
d1850e73: Fix incremental build break in openssl.
Merge commit '
d1850e739b0e6d5f788349db0bddb8277757f800' into eclair-mr2-plus-aosp
* commit '
d1850e739b0e6d5f788349db0bddb8277757f800':
Fix incremental build break in openssl.
Dan Egnor [Thu, 29 Oct 2009 20:05:27 +0000 (13:05 -0700)]
Fix incremental build break in openssl.
Scott Main [Thu, 29 Oct 2009 08:51:53 +0000 (01:51 -0700)]
am
df0ca900: am
a7d1eaf5: 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 '
df0ca90073b6a1ad432791661c481dc7bd34c21f' into eclair-mr2-plus-aosp
* commit '
df0ca90073b6a1ad432791661c481dc7bd34c21f':
docs: add checkbox to toggle the api level filter on and off;
Scott Main [Thu, 29 Oct 2009 08:25:23 +0000 (01:25 -0700)]
am
a7d1eaf5: 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 '
a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-mr2
* commit '
a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
docs: add checkbox to toggle the api level filter on and off;
Dan Egnor [Thu, 29 Oct 2009 00:22:05 +0000 (17:22 -0700)]
am
a6b495ce: Clean frameworks after replacing IDropBox.aidl with IDropBoxService.aidl, which causes some build confusion with dependencies and Parcelables and so on.
Merge commit '
a6b495ce40f640f581e27ebd8d935d706daa9f2d' into eclair-mr2-plus-aosp
* commit '
a6b495ce40f640f581e27ebd8d935d706daa9f2d':
Clean frameworks after replacing IDropBox.aidl with
android-build SharedAccount [Thu, 29 Oct 2009 00:21:53 +0000 (17:21 -0700)]
am
8a5d5272: resolved conflicts for merge of
3fa11599 to eclair-mr2
Merge commit '
8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp
* commit '
8a5d527223414c3c23b8021eb8ed468d3299e968':
Bump version to 2.1 API 6.
Dan Egnor [Wed, 28 Oct 2009 01:46:27 +0000 (18:46 -0700)]
Clean frameworks after replacing IDropBox.aidl with
IDropBoxService.aidl, which causes some build confusion
with dependencies and Parcelables and so on.
(Will be checked in immediately after the change in question)
android-build SharedAccount [Wed, 28 Oct 2009 23:12:11 +0000 (16:12 -0700)]
resolved conflicts for merge of
3fa11599 to eclair-mr2
Jean-Baptiste Queru [Wed, 28 Oct 2009 21:57:01 +0000 (14:57 -0700)]
merge from open-source master
Scott Main [Wed, 28 Oct 2009 17:42:13 +0000 (10:42 -0700)]
am
eae4fc96: am
836a695f: am
f1bac52f: fix search for offline docs. again.
Merge commit '
eae4fc960cec88f50eea7ae65f85f5722b0ad26b' into eclair-mr2-plus-aosp
* commit '
eae4fc960cec88f50eea7ae65f85f5722b0ad26b':
fix search for offline docs. again.
Dirk Dougherty [Wed, 28 Oct 2009 17:42:08 +0000 (10:42 -0700)]
am
12313686: am
ee3a3c1f: am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
12313686fb731e79224067ed13749c2c4dae4256' into eclair-mr2-plus-aosp
* commit '
12313686fb731e79224067ed13749c2c4dae4256':
doc change: include SDK Tools in notice to 1.6 developers.
Scott Main [Wed, 28 Oct 2009 17:30:34 +0000 (10:30 -0700)]
am
836a695f: am
f1bac52f: fix search for offline docs. again.
Merge commit '
836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2
* commit '
836a695f01799566969c12d5c83459bdb5d8b2c2':
fix search for offline docs. again.
Dirk Dougherty [Wed, 28 Oct 2009 17:26:52 +0000 (10:26 -0700)]
am
ee3a3c1f: am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-mr2
* commit '
ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
doc change: include SDK Tools in notice to 1.6 developers.
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.
Dianne Hackborn [Fri, 23 Oct 2009 19:17:45 +0000 (12:17 -0700)]
Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
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.
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.
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:23:04 +0000 (21:23 -0700)]
am
214ea8f1: am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
214ea8f14ee2b62b80905ad038110066f95be84b' into eclair-mr2-plus-aosp
* commit '
214ea8f14ee2b62b80905ad038110066f95be84b':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 04:13:32 +0000 (21:13 -0700)]
am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
3af366ddb2634f97f440b1437bbd21d00101c93b' into eclair-mr2
* commit '
3af366ddb2634f97f440b1437bbd21d00101c93b':
docs: implement sdk announcement in a collapsible box
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:19:06 +0000 (17:19 -0700)]
am
11cb880f: am
e0ac5c3e: 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 '
11cb880f1ef5296cb9eb1aff478808248eb7fe6b' into eclair-mr2-plus-aosp
* commit '
11cb880f1ef5296cb9eb1aff478808248eb7fe6b':
docs: change javascript so that SDK docs that are not
Scott Main [Sat, 24 Oct 2009 00:08:14 +0000 (17:08 -0700)]
am
e0ac5c3e: 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 '
e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-mr2
* commit '
e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
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:21:18 +0000 (13:21 -0700)]
am
7a0ec6b5: am
f963ee63: am
60dba894: docs: add eclair logo for homepage
Merge commit '
7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db' into eclair-mr2-plus-aosp
* commit '
7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db':
docs: add eclair logo for homepage
Scott Main [Fri, 23 Oct 2009 20:10:12 +0000 (13:10 -0700)]
am
f963ee63: am
60dba894: docs: add eclair logo for homepage
Merge commit '
f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2
* commit '
f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
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
Doug Zongker [Thu, 22 Oct 2009 23:46:31 +0000 (16:46 -0700)]
am
5f5f08dd: stop adding ota-rel-keys tag when signing
Merge commit '
5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb' into eclair-mr2-plus-aosp
* commit '
5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb':
stop adding ota-rel-keys tag when signing
Doug Zongker [Thu, 22 Oct 2009 23:09:34 +0000 (16:09 -0700)]
stop adding ota-rel-keys tag when signing
ota-rel-keys is now redundant with release-keys, since there are no
"half-signed" builds any more.
Brett Chabot [Thu, 22 Oct 2009 21:22:43 +0000 (14:22 -0700)]
am
7627a373: am
5449e457: Merge change I3fb149d2 into eclair
Merge commit '
7627a373f393e379a7fb80da8ea84081692db823' into eclair-mr2-plus-aosp
* commit '
7627a373f393e379a7fb80da8ea84081692db823':
Remove 'cd top' step from envsetup runtest shortcut.
Brett Chabot [Thu, 22 Oct 2009 21:12:09 +0000 (14:12 -0700)]
am
5449e457: Merge change I3fb149d2 into eclair
Merge commit '
5449e457534a619f7b2aaa008024095023b801ba' into eclair-mr2
* commit '
5449e457534a619f7b2aaa008024095023b801ba':
Remove 'cd top' step from envsetup runtest shortcut.
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:41:38 +0000 (11:41 -0700)]
am
31150b29: am
f03f574a: am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
31150b290e980254b0a92f753add0749b9c4b1ca' into eclair-mr2-plus-aosp
* commit '
31150b290e980254b0a92f753add0749b9c4b1ca':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:41:34 +0000 (11:41 -0700)]
am
3b5065ff: am
51da2c57: am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
3b5065ff869b85750eb191112235d46a48c05a49' into eclair-mr2-plus-aosp
* commit '
3b5065ff869b85750eb191112235d46a48c05a49':
doc change: template/asset changes for sdk package.
Dirk Dougherty [Thu, 22 Oct 2009 18:31:55 +0000 (11:31 -0700)]
am
f03f574a: am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-mr2
* commit '
f03f574a021e412b2060116c1112b62b4c21c2fe':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:31:51 +0000 (11:31 -0700)]
am
51da2c57: am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-mr2
* commit '
51da2c573d945d17890e519e7e26a89b2d2f7b51':
doc change: template/asset changes for sdk package.
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.
Owen Lin [Thu, 22 Oct 2009 16:33:33 +0000 (09:33 -0700)]
am
355670b9: am
64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '
355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp
* commit '
355670b98584210502f96fe0446a854f07026c28':
Add OVERRIDE_PACKAGES support for prebuild modules.
Brandon Ballinger [Thu, 22 Oct 2009 16:33:29 +0000 (09:33 -0700)]
am
c6c46243: am
36f349ac: Merge change Ied29246e into eclair
Merge commit '
c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp
* commit '
c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Owen Lin [Thu, 22 Oct 2009 13:44:28 +0000 (06:44 -0700)]
am
64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2
* commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
Brandon Ballinger [Thu, 22 Oct 2009 13:43:04 +0000 (06:43 -0700)]
am
36f349ac: Merge change Ied29246e into eclair
Merge commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2
* commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Doug Zongker [Thu, 22 Oct 2009 05:31:04 +0000 (22:31 -0700)]
am
b04f8cdc: am
decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit '
b04f8cdccf01132c7c14df1fed1f39c9dbb752c6' into eclair-mr2-plus-aosp
* commit '
b04f8cdccf01132c7c14df1fed1f39c9dbb752c6':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Doug Zongker [Thu, 22 Oct 2009 05:22:32 +0000 (22:22 -0700)]
am
decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit '
decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2
* commit '
decdbd7956c34895f73001cfa2018a27c8702ad0':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
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
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)
Owen Lin [Tue, 20 Oct 2009 17:08:00 +0000 (10:08 -0700)]
am
daf234d3: am
0a7b54de: Add package Gallery into default build.
Merge commit '
daf234d374840d96282b34393309487a21ab45c4' into eclair-mr2-plus-aosp
* commit '
daf234d374840d96282b34393309487a21ab45c4':
Add package Gallery into default build.
Owen Lin [Tue, 20 Oct 2009 16:57:53 +0000 (09:57 -0700)]
am
0a7b54de: Add package Gallery into default build.
Merge commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21' into eclair-mr2
* commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21':
Add package Gallery into default build.
Owen Lin [Thu, 15 Oct 2009 09:09:18 +0000 (02:09 -0700)]
Add package Gallery into default build.
Change-Id: Ia4447fdb6c4c26a5419ef59cc9d8276838a95854
Steve Block [Tue, 20 Oct 2009 09:34:59 +0000 (02:34 -0700)]
am
9234663c: WebKit clean required by merge with new WebKit version.
Merge commit '
9234663c558239cc7f97f5daf287f12a177e7dba' into eclair-mr2-plus-aosp
* commit '
9234663c558239cc7f97f5daf287f12a177e7dba':
WebKit clean required by merge with new WebKit version.
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.)
Steve Block [Mon, 19 Oct 2009 17:41:07 +0000 (18:41 +0100)]
WebKit clean required by merge with new WebKit version.
Change-Id: I59377d6a0420bfb13b25b4ed7240b47e8aae6114
Dirk Dougherty [Sat, 17 Oct 2009 00:14:33 +0000 (17:14 -0700)]
doc change: template/asset changes for sdk package.
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:08 +0000 (16:02 -0700)]
merge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 15:18:24 +0000 (08:18 -0700)]
merge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 01:04:35 +0000 (18:04 -0700)]
Merge from donut
Android (Google) Code Review [Tue, 13 Oct 2009 21:12:59 +0000 (17:12 -0400)]
Merge change I04432db5 into eclair-mr2
* changes:
use aapt to build jar files instead of the system zip
Raphael [Tue, 13 Oct 2009 19:18:21 +0000 (12:18 -0700)]
am
aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '
aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-plus-aosp
* commit '
aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Raphael [Tue, 13 Oct 2009 19:17:40 +0000 (12:17 -0700)]
am
aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '
aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2
* commit '
aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Raphael [Mon, 12 Oct 2009 23:16:02 +0000 (16:16 -0700)]
Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
Doug Zongker [Fri, 9 Oct 2009 19:11:30 +0000 (12:11 -0700)]
use aapt to build jar files instead of the system zip
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.
Jean-Baptiste Queru [Fri, 9 Oct 2009 17:24:23 +0000 (10:24 -0700)]
reconcile tools-docs into main branch
Dianne Hackborn [Fri, 9 Oct 2009 04:07:12 +0000 (21:07 -0700)]
am
ff6f3fe4: Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Merge commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2
* commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Dianne Hackborn [Fri, 9 Oct 2009 04:06:51 +0000 (21:06 -0700)]
am
ff6f3fe4: Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Merge commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-plus-aosp
* commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
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
Brett Chabot [Thu, 8 Oct 2009 21:42:58 +0000 (14:42 -0700)]
Merge commit '
1b3886b8' into manualmerge
Brett Chabot [Thu, 8 Oct 2009 20:47:07 +0000 (13:47 -0700)]
Merge commit '
af6ccb69' into manualmerge
Brett Chabot [Thu, 8 Oct 2009 18:19:00 +0000 (11:19 -0700)]
am
1b3886b8: am
45dc54f6: Add speech tests to CTS makefile.
Merge commit '
1b3886b8485589438a86ccb5b9dbb9067da35627' into eclair-plus-aosp
* commit '
1b3886b8485589438a86ccb5b9dbb9067da35627':
Add speech tests to CTS makefile.
Brett Chabot [Thu, 8 Oct 2009 18:18:57 +0000 (11:18 -0700)]
am
af6ccb69: am
30e1f2bd: Add dpi tests to CTS.
Merge commit '
af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4' into eclair-plus-aosp
* commit '
af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4':
Add dpi tests to CTS.
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.