Commit graph

1260 commits

Author SHA1 Message Date
Scott Main
a072b4f780 am 47f77397: 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 '47f77397bed3c381101423d143e83b2cc7e27b49'

* commit '47f77397bed3c381101423d143e83b2cc7e27b49':
  docs: revise resizing scripts to better organize the
2009-11-03 19:32:27 -08:00
Scott Main
47f77397be 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
2009-11-03 19:22:34 -08:00
Scott Main
747f2997f1 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
2009-11-03 19:12:40 -08:00
Scott Main
24fbbfaa80 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
2009-11-03 19:04:40 -08:00
Scott Main
3f7d1df129 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.
2009-11-02 20:06:04 -08:00
Scott Main
54f99f57e6 am 034a1089: am 4d3aa886: am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '034a10891facd6e334be71b515e1d65c281f4278'

* commit '034a10891facd6e334be71b515e1d65c281f4278':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 19:08:25 -08:00
Scott Main
034a10891f 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.
2009-11-02 18:59:08 -08:00
Scott Main
4d3aa886db 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.
2009-11-02 18:50:09 -08:00
Scott Main
ec4194ef1b 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.
2009-11-02 18:40:23 -08:00
Scott Main
64b879ac5b 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.
2009-11-02 18:05:41 -08:00
Scott Main
a521e3eda8 am 8d89f800: 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 '8d89f800ceb04a726597779be845cc45090c8c46'

* commit '8d89f800ceb04a726597779be845cc45090c8c46':
  docs: fix IE6 bug in which tabs are not focusable
2009-11-01 21:55:23 -08:00
Scott Main
8d89f800ce 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
2009-10-30 15:25:01 -07:00
Scott Main
3f08740b0c 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
2009-10-30 15:15:14 -07:00
Scott Main
32b505d984 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
2009-10-30 15:04:17 -07:00
Scott Main
8e44ae9c76 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.
2009-10-30 13:33:39 -07:00
Dan Egnor
8f313a35f8 am b4df557e: am d1850e73: Fix incremental build break in openssl.
Merge commit 'b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f'

* commit 'b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f':
  Fix incremental build break in openssl.
2009-10-29 13:26:27 -07:00
Dan Egnor
b4df557ed9 am d1850e73: Fix incremental build break in openssl.
Merge commit 'd1850e739b0e6d5f788349db0bddb8277757f800' into eclair-mr2-plus-aosp

* commit 'd1850e739b0e6d5f788349db0bddb8277757f800':
  Fix incremental build break in openssl.
2009-10-29 13:15:33 -07:00
Dan Egnor
d1850e739b Fix incremental build break in openssl. 2009-10-29 13:05:27 -07:00
Scott Main
a06f395a0a am 4ffcb763: 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 '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d'

* commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-29 01:59:40 -07:00
Scott Main
4ffcb76344 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;
2009-10-29 01:51:53 -07:00
Dan Egnor
2b738b4d15 am eda684a2: 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 'eda684a2666a98d38e7620b59ffd4e335a4f27f6'

* commit 'eda684a2666a98d38e7620b59ffd4e335a4f27f6':
  Clean frameworks after replacing IDropBox.aidl with
2009-10-29 01:34:38 -07:00
android-build SharedAccount
96fb8fef18 resolved conflicts for merge of 01e7a68f to master 2009-10-29 01:31:08 -07:00
Scott Main
df0ca90073 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;
2009-10-29 01:25:23 -07:00
Jean-Baptiste Queru
c4ec93ec84 am 110dd464: merge from open-source master
Merge commit '110dd46414574da42c4f07b629b31977d144a849'

* commit '110dd46414574da42c4f07b629b31977d144a849': (46 commits)
  DRC65
  DRC63C
  DRC63B
  DRC63
  DRC62
  DRC59
  DRC58C
  DRC58B
  DRC58
  DRC52
  DRC51
  DRC50
  DRC49
  DRC48
  DRC45B
  DRC45
  DRC44
  DRC43
  DRC42
  DRC37B
  ...
2009-10-28 23:57:08 -07:00
Scott Main
8866d26c67 am df5e7f7b: am eae4fc96: am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e'

* commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e':
  fix search for offline docs. again.
2009-10-28 23:48:21 -07:00
Dirk Dougherty
3e7a1470c1 am e528cbdc: am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab'

* commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-28 23:48:14 -07:00
Dan Egnor
eda684a266 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
2009-10-28 17:22:05 -07:00
android-build SharedAccount
01e7a68fd0 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.
2009-10-28 17:21:53 -07:00
Dan Egnor
a6b495ce40 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)
2009-10-28 16:25:47 -07:00
android-build SharedAccount
8a5d527223 resolved conflicts for merge of 3fa11599 to eclair-mr2 2009-10-28 16:12:11 -07:00
Jean-Baptiste Queru
110dd46414 merge from open-source master 2009-10-28 14:57:01 -07:00
Scott Main
df5e7f7b57 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.
2009-10-28 10:42:13 -07:00
Dirk Dougherty
e528cbdcb5 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.
2009-10-28 10:42:08 -07:00
Scott Main
eae4fc960c am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2

* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
  fix search for offline docs. again.
2009-10-28 10:30:34 -07:00
Dirk Dougherty
12313686fb 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.
2009-10-28 10:26:52 -07:00
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
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
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
Scott Main
f1bac52fe2 fix search for offline docs. again. 2009-10-26 14:44:48 -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
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
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