Scott Main
a7d1eaf572
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;
2009-10-27 17:39:37 -07:00
Scott Main
9b5fdb9c23
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.
2009-10-27 16:56:08 -07:00
Dianne Hackborn
b8906579ab
am 3fa11599: Bump version to 2.1 API 6.
...
Merge commit '3fa115999c8512095301724f557821f25ddfe08f' into eclair-plus-aosp
* commit '3fa115999c8512095301724f557821f25ddfe08f':
Bump version to 2.1 API 6.
2009-10-27 12:57:08 -07:00
Android (Google) Code Review
704181ee5b
Merge change I3bb7eab9
...
* changes:
Rebuild target object files with new GCC 4.4.0 toolchain.
2009-10-27 15:54:19 -04:00
Dianne Hackborn
3fa115999c
Bump version to 2.1 API 6.
...
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
2009-10-26 17:40:19 -07:00
Scott Main
555cca7d31
am 836a695f: am f1bac52f: fix search for offline docs. again.
...
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-plus-aosp
* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
fix search for offline docs. again.
2009-10-26 15:50:36 -07:00
Scott Main
836a695f01
am f1bac52f: fix search for offline docs. again.
...
Merge commit 'f1bac52fe28ba503c63c929d9d0711671273635f' into eclair
* commit 'f1bac52fe28ba503c63c929d9d0711671273635f':
fix search for offline docs. again.
2009-10-26 15:41:42 -07:00
Jean-Baptiste Queru
b51df61592
merge from open-source master
2009-10-26 15:14:42 -07:00
Scott Main
f1bac52fe2
fix search for offline docs. again.
2009-10-26 14:44:48 -07:00
Dirk Dougherty
59de278178
am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
...
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-plus-aosp
* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
doc change: include SDK Tools in notice to 1.6 developers.
2009-10-26 11:28:19 -07:00
Dirk Dougherty
ee3a3c1f59
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.
2009-10-26 11:18:47 -07:00
Dirk Dougherty
c2c5e505ac
doc change: include SDK Tools in notice to 1.6 developers.
...
Bug:2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
2009-10-24 14:38:58 -07:00
Scott Main
3f19cc16b6
am 66a27b01: 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 '66a27b01201027e371b74b0eb18572dfb7303238'
* commit '66a27b01201027e371b74b0eb18572dfb7303238':
docs: implement sdk announcement in a collapsible box
2009-10-23 21:32:32 -07:00
Scott Main
66a27b0120
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
2009-10-23 21:23:04 -07:00
Scott Main
214ea8f14e
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
2009-10-23 21:13:32 -07:00
Scott Main
a1ff4fccee
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-plus-aosp
* commit '3af366ddb2634f97f440b1437bbd21d00101c93b':
docs: implement sdk announcement in a collapsible box
2009-10-23 21:13:26 -07:00
Scott Main
3af366ddb2
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
2009-10-23 21:04:02 -07:00
Scott Main
bd4b2f7b7f
am c41d2516: 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 'c41d251615431a36fc3b664d2bdbe749702a11d9'
* commit 'c41d251615431a36fc3b664d2bdbe749702a11d9':
docs: change javascript so that SDK docs that are not
2009-10-23 17:29:02 -07:00
Scott Main
c41d251615
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
2009-10-23 17:19:06 -07:00
Scott Main
de5108cc5e
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-plus-aosp
* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
2009-10-23 17:08:49 -07:00
Scott Main
11cb880f1e
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
2009-10-23 17:08:14 -07:00
Scott Main
e0ac5c3e86
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
2009-10-23 17:00:25 -07:00
Scott Main
462cc37742
docs: implement sdk announcement in a collapsible box
...
and revise the 'special' box color and add rounded corners.
2009-10-23 16:47:09 -07:00
Elliott Hughes
3bb7eab9ca
Rebuild target object files with new GCC 4.4.0 toolchain.
...
Bug: 2139334
2009-10-23 16:20:21 -07:00
Scott Main
3bdae948b1
am ac1e24cc: am 7a0ec6b5: am f963ee63: am 60dba894: docs: add eclair logo for homepage
...
Merge commit 'ac1e24ccd622b17f5054460b40baad2e07585781'
* commit 'ac1e24ccd622b17f5054460b40baad2e07585781':
docs: add eclair logo for homepage
2009-10-23 13:32:09 -07:00
Scott Main
ac1e24ccd6
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
2009-10-23 13:21:18 -07:00
Scott Main
5719fe7954
am f963ee63: am 60dba894: docs: add eclair logo for homepage
...
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-plus-aosp
* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
2009-10-23 13:10:48 -07:00
Scott Main
7a0ec6b566
am f963ee63: am 60dba894: docs: add eclair logo for homepage
...
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2
* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
2009-10-23 13:10:12 -07:00
Scott Main
0d8872e6f2
docs: change javascript so that SDK docs that are not
...
listed in the left nav do not highlight parent index documents
2009-10-23 13:05:56 -07:00
Scott Main
f963ee638c
am 60dba894: docs: add eclair logo for homepage
...
Merge commit '60dba89451e4ee489720436a9a3f3de4823da7d2' into eclair
* commit '60dba89451e4ee489720436a9a3f3de4823da7d2':
docs: add eclair logo for homepage
2009-10-23 13:02:29 -07:00
Scott Main
60dba89451
docs: add eclair logo for homepage
2009-10-23 12:22:42 -07:00
Doug Zongker
e60ff98d3b
am 48324393: am 5f5f08dd: stop adding ota-rel-keys tag when signing
...
Merge commit '4832439384f5b1a58a79cc087655879fbd2f527d'
* commit '4832439384f5b1a58a79cc087655879fbd2f527d':
stop adding ota-rel-keys tag when signing
2009-10-22 19:06:15 -07:00
Brett Chabot
fcf24db602
am 89e8bad0: am 7627a373: am 5449e457: Merge change I3fb149d2 into eclair
...
Merge commit '89e8bad0cf3f70bcf61809c6078001451a181b4a'
* commit '89e8bad0cf3f70bcf61809c6078001451a181b4a':
Remove 'cd top' step from envsetup runtest shortcut.
2009-10-22 19:04:21 -07:00
Doug Zongker
4832439384
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
2009-10-22 16:46:31 -07:00
Doug Zongker
5f5f08dd22
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.
2009-10-22 16:09:34 -07:00
Android (Google) Code Review
8361f7e4f1
Merge change I064ac356
...
* changes:
Only put .o files into static libraries when building for the host.
2009-10-22 17:40:18 -04:00
Brett Chabot
89e8bad0cf
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.
2009-10-22 14:22:43 -07:00
Brett Chabot
b3dda83c22
am 5449e457: Merge change I3fb149d2 into eclair
...
Merge commit '5449e457534a619f7b2aaa008024095023b801ba' into eclair-plus-aosp
* commit '5449e457534a619f7b2aaa008024095023b801ba':
Remove 'cd top' step from envsetup runtest shortcut.
2009-10-22 14:12:52 -07:00
Brett Chabot
7627a373f3
am 5449e457: Merge change I3fb149d2 into eclair
...
Merge commit '5449e457534a619f7b2aaa008024095023b801ba' into eclair-mr2
* commit '5449e457534a619f7b2aaa008024095023b801ba':
Remove 'cd top' step from envsetup runtest shortcut.
2009-10-22 14:12:09 -07:00
Android (Google) Code Review
5449e45753
Merge change I3fb149d2 into eclair
...
* changes:
Remove 'cd top' step from envsetup runtest shortcut.
2009-10-22 17:04:56 -04:00
Dan Bornstein
6581feda85
Only put .o files into static libraries when building for the host.
...
In particular don't put the symbol indices from included .a files into
them. I didn't change the equivalent device rule ala the "if it ain't
broke" rule of thumb.
Change-Id: I064ac356a6f48f93fca2cd08a8408ca835f8f9a4
2009-10-22 13:14:41 -07:00
Dirk Dougherty
f3cc23fc8e
am 99dd0f86: am 31150b29: am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure.
...
Merge commit '99dd0f8604319dd1316045e74de4296fff42810a'
* commit '99dd0f8604319dd1316045e74de4296fff42810a':
doc change: template changes for new SDK doc structure.
2009-10-22 11:51:14 -07:00
Dirk Dougherty
12b198e0a7
am 308228ba: am 3b5065ff: am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package.
...
Merge commit '308228baa983d5216a7f3bfaff1547f88a99465b'
* commit '308228baa983d5216a7f3bfaff1547f88a99465b':
doc change: template/asset changes for sdk package.
2009-10-22 11:51:10 -07:00
Dirk Dougherty
99dd0f8604
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.
2009-10-22 11:41:38 -07:00
Dirk Dougherty
308228baa9
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.
2009-10-22 11:41:34 -07:00
Dirk Dougherty
31150b290e
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.
2009-10-22 11:31:55 -07:00
Dirk Dougherty
3b5065ff86
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.
2009-10-22 11:31:51 -07:00
Dirk Dougherty
daeda811ab
am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure.
...
Merge commit 'f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-plus-aosp
* commit 'f03f574a021e412b2060116c1112b62b4c21c2fe':
doc change: template changes for new SDK doc structure.
2009-10-22 11:31:15 -07:00
Dirk Dougherty
db02360018
am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package.
...
Merge commit '51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-plus-aosp
* commit '51da2c573d945d17890e519e7e26a89b2d2f7b51':
doc change: template/asset changes for sdk package.
2009-10-22 11:31:11 -07:00
Dirk Dougherty
f03f574a02
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.
2009-10-22 11:22:00 -07:00
