Commit graph

374 commits

Author SHA1 Message Date
Dirk Dougherty
4b2eb9734f cherry-pick db00a226071878ae9bd821d28903dca8f6071140 to froyo.
Change-Id: I2ba25432014c7f04748cd6502d6ded997ef21f48
2010-03-26 18:59:47 -07:00
Dirk Dougherty
e123385cca cherry-pick fe0104041858046a0aa649c791869d7eb1a5c175 to froyo.
Change-Id: I9c95ebc6f735cb6abc2b0920c2274e0b5ce0ef70
2010-03-26 18:56:30 -07:00
Scott Main
84f8a5e2ef docs: remove sidebox-inner style
Change-Id: Ia1e1b10e6756ecf6c9154c2cc25d0dbd58c1907f
2010-03-24 17:20:39 -07:00
Scott Main
b89740f8ba docs: stylesheet change for figure class
Change-Id: I1f47fc70382daf9f14e057a83375cf727fb8afa7
2010-03-24 13:49:49 -07:00
Scott Main
67c2a965bb docs: style tweaks to sidebox and qv classes
Removes extra whitespace from above the sidebox class and
adjusts the inner padding.

Removes extra whitespace from the right side of the quickview box
to align with the document margin.

Change-Id: I3d37ecc9a251a2c5c4e8d2c2942d05848c698faa
2010-03-16 17:18:24 -07:00
Scott Main
ee629d9c9d revise script and styles for the expandable widget in the dev
guide side nav to allow nested toggle lists. This is necessary
for the new resources docs that have an expandable list nested
in an expandable list.
2010-02-05 14:37:58 -08:00
Scott Main
80ec85cc47 am 5729dbfa: am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit '5729dbfa00ffb659c5758195b617af4349c0ef75'

* commit '5729dbfa00ffb659c5758195b617af4349c0ef75':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-28 15:06:03 -08:00
Jesse Wilson
98647acd91 Merge "Suppress the annoying "XML missing method" warnings from the doc build." 2010-01-28 13:33:29 -08:00
Jesse Wilson
b127997b14 Suppress the annoying "XML missing method" warnings from the doc build. 2010-01-28 10:50:58 -08:00
Dirk Dougherty
7260470e76 am 262e8214: am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '262e821409fbd59b593e56cb75a339e8a2364533'

* commit '262e821409fbd59b593e56cb75a339e8a2364533':
  doc change: add announce for developer lab at mwc.
2010-01-28 10:48:00 -08:00
Scott Main
5729dbfa00 am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit 'e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp

* commit 'e6fed8807f469a91e10b64990a7709482378dfa9':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-26 15:01:13 -08:00
Scott Main
e6fed8807f Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug: 1909300" into eclair 2010-01-25 15:39:40 -08:00
Scott Main
9033c12688 docs: accept the enter key on key-down, rather than key-up,
in order to be sure we capture this key before anything else.
Fixes case where highlighted suggestions don't get executed
when pressed.
Bug: 1909300
2010-01-25 15:26:10 -08:00
Dirk Dougherty
262e821409 am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp

* commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
  doc change: add announce for developer lab at mwc.
2010-01-22 14:27:55 -08:00
Dirk Dougherty
6339cfe89b Merge "doc change: add announce for developer lab at mwc." into eclair 2010-01-22 14:23:07 -08:00
Dirk Dougherty
781a636aed doc change: add announce for developer lab at mwc.
Bug: 2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33
2010-01-22 13:24:55 -08:00
Scott Main
a1a93b35e9 am daa3b7a4: am 945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a'

* commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a':
  docs: add the ability to exclude PRE elements from being prettified
2010-01-22 09:43:09 -08:00
Scott Main
daa3b7a469 am 945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp

* commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e':
  docs: add the ability to exclude PRE elements from being prettified
2010-01-19 11:13:44 -08:00
Scott Main
945ed36ec4 docs: add the ability to exclude PRE elements from being prettified
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
2010-01-19 10:59:16 -08:00
Scott Main
923d541486 am 4bd6c862: am 3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '4bd6c862f0897f99abc227611822e1dace03b6e0'

* commit '4bd6c862f0897f99abc227611822e1dace03b6e0':
  docs: hide the "back to top" link when there's no vertical scroll
2010-01-13 12:17:08 -08:00
Scott Main
4bd6c862f0 am 3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb' into eclair-plus-aosp

* commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb':
  docs: hide the "back to top" link when there's no vertical scroll
2010-01-13 11:18:02 -08:00
Scott Main
13b79b2eb1 docs: hide the "back to top" link when there's no vertical scroll
also use local variables for DOM objects (in a slow effort to eventually
remove all non-essential global vars)
2010-01-13 08:22:27 -08:00
Scott Main
685e9f3ec3 am 29bec3f7: am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to h
Merge commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb'

* commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb':
  docs: make the Resources docs use the same clearsilver template
2010-01-12 13:11:58 -08:00
Scott Main
29bec3f707 am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the
Merge commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336' into eclair-plus-aosp

* commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336':
  docs: make the Resources docs use the same clearsilver template
2010-01-12 12:23:50 -08:00
Scott Main
7e680c89ae Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the Resources tab)." into eclair 2010-01-12 12:19:57 -08:00
Dirk Dougherty
f3538b21aa am bd4fcbfb: am 5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit 'bd4fcbfb03758cca84b6ce0041cfa77e178f6135'

* commit 'bd4fcbfb03758cca84b6ce0041cfa77e178f6135':
  SDK doc change: css styling for blockquote.
2010-01-07 12:47:15 -08:00
Dirk Dougherty
bd4fcbfb03 am 5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit '5b3952249ccf7e41ac6a0ac1490cf150bca3a80f' into eclair-plus-aosp

* commit '5b3952249ccf7e41ac6a0ac1490cf150bca3a80f':
  SDK doc change: css styling for blockquote.
2010-01-07 12:43:47 -08:00
Dirk Dougherty
5b3952249c Merge "SDK doc change: css styling for blockquote." into eclair 2010-01-07 12:39:47 -08:00
Dirk Dougherty
a16e79c8b0 SDK doc change: css styling for blockquote.
Bug: 2160782
Change-Id: I99a9494feb8b754636745f979db27380ae623c96
2010-01-07 12:23:01 -08:00
Scott Main
554d1fa649 am 91533402: am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit '915334025e0c7a5b77c387315118e687461e4842'

* commit '915334025e0c7a5b77c387315118e687461e4842':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
2010-01-07 10:08:48 -08:00
Scott Main
915334025e am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit 'b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp

* commit 'b6da4808699180c608bccef88ddb843411e663c7':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
2010-01-07 10:06:00 -08:00
Scott Main
b6da480869 update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This now will avoid writing the cookie for the width when IE6 calls
resizeWidth() in order to properly resize the doc-content div (other
browsers to not call resizeWidth() for resizing doc-content because it
has auto width, which IE6 does not perform).
2010-01-06 16:58:52 -08:00
Scott Main
9776131af8 am 83e85549: am a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit '83e855494b0b4215c78593efdf69b98c115288f1'

* commit '83e855494b0b4215c78593efdf69b98c115288f1':
  docs: fix resizeAll script for IE6 so that the resizeWidth function
2010-01-06 16:57:28 -08:00
Scott Main
83e855494b am a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp

* commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a':
  docs: fix resizeAll script for IE6 so that the resizeWidth function
2010-01-06 16:55:15 -08:00
Scott Main
a39d3bb0c9 docs: fix resizeAll script for IE6 so that the resizeWidth function
is only called when the side navigation is actually resizable

This stops 'width' cookies from being written for the SDK docs
(and any other page that doesn't have resizable nav) and also adds
some security to the init() function to be sure we properly read
cookie names.
2010-01-06 14:33:20 -08:00
Scott Main
3669072b81 docs: make the Resources docs use the same clearsilver template
as the Dev Guide. This removes the custom resourcespage.cs file
and routes resources pages to use docpage.cs, while still
setting the resource hdf flag true (in order to highlight the
Resources tab).
2009-12-17 12:52:54 -08:00
Scott Main
c5aea0ebcd am b0c21911: am 99a25fba: Merge change I92c7fe59 into eclair
Merge commit 'b0c219115533fe94056d4498603ce8e474e1b9a0'

* commit 'b0c219115533fe94056d4498603ce8e474e1b9a0':
  docs: change DOCTYPE to html5 format
2009-12-16 21:43:46 -08:00
Scott Main
b0c2191155 am 99a25fba: Merge change I92c7fe59 into eclair
Merge commit '99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp

* commit '99a25fbaa50a077c5d62b9ae204677c176534d8b':
  docs: change DOCTYPE to html5 format
2009-12-16 21:40:55 -08:00
Android (Google) Code Review
99a25fbaa5 Merge change I92c7fe59 into eclair
* changes:
  docs: change DOCTYPE to html5 format
2009-12-16 21:38:02 -08:00
Scott Main
92c7fe59a7 docs: change DOCTYPE to html5 format 2009-12-16 21:36:15 -08:00
Scott Main
b8143d2f0a am d79b160d: am ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit 'd79b160d90450068237282393be0d7456cb14bc1'

* commit 'd79b160d90450068237282393be0d7456cb14bc1':
  docs for esr: add support for breadcrumbing in the resource docs
2009-12-16 15:52:41 -08:00
Scott Main
d79b160d90 am ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp

* commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
  docs for esr: add support for breadcrumbing in the resource docs
2009-12-16 15:44:37 -08:00
Scott Main
ab32fed6a8 docs for esr: add support for breadcrumbing in the resource docs 2009-12-16 15:36:20 -08:00
Dirk Dougherty
36b5ae6597 am 930ca65a: am 8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '930ca65a3cde0bf0817e38efee5772338abbf0c0'

* commit '930ca65a3cde0bf0817e38efee5772338abbf0c0':
  sdk doc change for esr: Add left nav highlight for interior files in resources tab.
2009-12-15 23:31:15 -08:00
Dirk Dougherty
930ca65a3c am 8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp

* commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1':
  sdk doc change for esr: Add left nav highlight for interior files in resources tab.
2009-12-15 19:29:52 -08:00
Android (Google) Code Review
8c627b0489 Merge change Ib471b5b2 into eclair
* changes:
  sdk doc change for esr: Add left nav highlight for interior files in resources tab.
2009-12-15 19:26:48 -08:00
Dirk Dougherty
f32c5acb2e sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Bug:2160782
Change-Id: Ib471b5b28f599447e77294c8dcc23d24a18c3436
2009-12-15 18:48:38 -08:00
Xavier Ducrohet
e035d596cd am 374909f6: am fac84b56: Merge change Icb5cf14e into eclair
Merge commit '374909f68a78941909ecd0b6a329822fdd01cac5'

* commit '374909f68a78941909ecd0b6a329822fdd01cac5':
  Add feature list support to DroidDoc.
2009-12-15 15:03:19 -08:00
Dirk Dougherty
12b61a9824 am 7b0e85e1: am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '7b0e85e1814376286c7d036f73241f9a19f70b08'

* commit '7b0e85e1814376286c7d036f73241f9a19f70b08':
  sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
2009-12-15 15:03:11 -08:00
Xavier Ducrohet
374909f68a am fac84b56: Merge change Icb5cf14e into eclair
Merge commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp

* commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c':
  Add feature list support to DroidDoc.
2009-12-15 07:42:24 -08:00
Dirk Dougherty
7b0e85e181 am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp

* commit '502c498fec23cb28d16f5e86e981400f76da36ea':
  sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
2009-12-15 07:38:57 -08:00
Xavier Ducrohet
f9b6d38d07 Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.

This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)

Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
2009-12-14 17:55:05 -08:00
Dirk Dougherty
502c498fec sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug: 2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
2009-12-11 20:54:08 -08:00
Scott Main
1e99d1688e am be4eca18: am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38'

* commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38':
  docs: add "figure" class for DIV elements that contain
2009-12-10 23:41:29 -08:00
Scott Main
be4eca1894 am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb' into eclair-mr2-plus-aosp

* commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb':
  docs: add "figure" class for DIV elements that contain
2009-12-10 17:52:19 -08:00
Scott Main
8625adde23 am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp

* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
  docs: add "figure" class for DIV elements that contain
2009-12-09 18:17:50 -08:00
Scott Main
483cf38d8d docs: add "figure" class for DIV elements that contain
a figure image with caption text.

needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
2009-12-09 18:08:32 -08:00
Scott Main
e79b9dfc06 am 0be5c863: am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit '0be5c863a204cc37fda35574c3111ac363b26b17'

* commit '0be5c863a204cc37fda35574c3111ac363b26b17':
  docs: add context coloring to code snippets with prettify script
2009-12-08 14:51:26 -08:00
Scott Main
0be5c863a2 am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit 'a2496682f9c6f9311199df7300bb8e16298cf40d' into eclair-mr2-plus-aosp

* commit 'a2496682f9c6f9311199df7300bb8e16298cf40d':
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:39:04 -08:00
Scott Main
7fd7dc46f5 am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp

* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:33:18 -08:00
Scott Main
f8af887a06 docs: add context coloring to code snippets with prettify script 2009-12-03 10:52:30 -08:00
Scott Main
f7161130f0 am 33c5806e: am 3bfb5192: am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '33c5806e3e19ed95eca664b4798c1e819fbaade7'

* commit '33c5806e3e19ed95eca664b4798c1e819fbaade7':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:16:02 -08:00
Scott Main
33c5806e3e am 3bfb5192: am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc' into eclair-mr2-plus-aosp

* commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:10:35 -08:00
Scott Main
7f927afdd6 am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-plus-aosp

* commit '0086ab50631cfc6abb0f591871f5bb5da74e4606':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:06:10 -08:00
Scott Main
0086ab5063 am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '1a177879281ac6ed541a8f875c0130c3355ab6f9' into eclair

* commit '1a177879281ac6ed541a8f875c0130c3355ab6f9':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:02:17 -08:00
Android (Google) Code Review
1a17787928 Merge change I06c40454 into eclair-sdk
* changes:
  droiddoc change: revise the sample code generating script so that all the source code pages are NOT generated for the offline version of the docs (only show source in html for online docs).
2009-11-23 12:55:36 -08:00
Scott Main
431e43d655 am 31493fc3: am ff17131e: am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '31493fc3a0f8ff736b07033fc46dc2d60089a450'

* commit '31493fc3a0f8ff736b07033fc46dc2d60089a450':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:51:31 -08:00
Scott Main
31493fc3a0 am ff17131e: am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit 'ff17131e6c45337663ec8c086185cdbd2c8ca10a' into eclair-mr2-plus-aosp

* commit 'ff17131e6c45337663ec8c086185cdbd2c8ca10a':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:47:22 -08:00
Scott Main
41225c49b9 am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit 'c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-plus-aosp

* commit 'c3467e43febbc39cbb43afe25dd988641e2f0218':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:42:44 -08:00
Scott Main
c3467e43fe am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '4cdb7149127d9527411ed73e26604a2cf2292435' into eclair

* commit '4cdb7149127d9527411ed73e26604a2cf2292435':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:38:47 -08:00
Scott Main
4cdb714912 docs: change the ADP image for the homepage carousel
Change-Id: I6141f32e18918d51d72cfa645f0ceea709002cc6
2009-11-20 16:22:14 -08:00
Scott Main
2fa99f1dd6 droiddoc change: revise the sample code generating script so that
all the source code pages are NOT generated for the offline version
of the docs (only show source in html for online docs).

This won't work until a companion change from framwork/base/Android.mk
is submitted (but shouldn't break the build).

Change-Id: I06c404540870071c2a5a8aa460e156506fd975cb
2009-11-20 10:41:49 -08:00
Scott Main
f8d8feb884 am 5a5631f5: am 7bcb88ff: am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d'

* commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d':
  docs: revise user agent detection to use lower case
2009-11-20 10:08:53 -08:00
Scott Main
5a5631f5c0 am 7bcb88ff: am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8' into eclair-mr2-plus-aosp

* commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8':
  docs: revise user agent detection to use lower case
2009-11-20 10:04:01 -08:00
Scott Main
e31f151464 am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-plus-aosp

* commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd':
  docs: revise user agent detection to use lower case
2009-11-20 09:59:25 -08:00
Scott Main
c00b2cf9c6 am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961' into eclair

* commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961':
  docs: revise user agent detection to use lower case
2009-11-20 09:55:08 -08:00
Android (Google) Code Review
91ed9bbbdc Merge change Id8115ffb into eclair-sdk
* changes:
  docs: revise user agent detection to use lower case for string comparisons and add 'webos' as a mobile device
2009-11-20 09:38:18 -08:00
Dirk Dougherty
7d729b7512 am f94ea5eb: am 952ea818: am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit 'f94ea5ebe4f26db253d9e6f6baee485f378e6344'

* commit 'f94ea5ebe4f26db253d9e6f6baee485f378e6344':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 17:39:01 -08:00
Dirk Dougherty
f94ea5ebe4 am 952ea818: am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3' into eclair-mr2-plus-aosp

* commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:48:16 -08:00
Dirk Dougherty
d9a916e3e2 am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-plus-aosp

* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:28:26 -08:00
Android (Google) Code Review
aefcbfcf6e Merge change Ib5817a3a into eclair
* changes:
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:24:29 -08:00
Dirk Dougherty
b5817a3a93 sdk doc change for esr: update version refs to 2.0.1.
Bug: 2160782
2009-11-18 23:15:13 -08:00
Scott Main
8f35bce3ac am 2570dac3: am 7239d522: am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '2570dac37bea232ed28b2322beb0407ed19b15f1'

* commit '2570dac37bea232ed28b2322beb0407ed19b15f1':
  docs: make all javadoc reference links use <code>
2009-11-18 18:00:55 -08:00
Scott Main
2570dac37b am 7239d522: am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '7239d522c59661129850d818fe6986074b6aa002' into eclair-mr2-plus-aosp

* commit '7239d522c59661129850d818fe6986074b6aa002':
  docs: make all javadoc reference links use <code>
2009-11-18 17:54:57 -08:00
Scott Main
ce9badf1bd am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit 'ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-plus-aosp

* commit 'ec9baf22a959af85f77f56360e95a738f360c4f0':
  docs: make all javadoc reference links use <code>
2009-11-18 17:47:46 -08:00
Jean-Baptiste Queru
8a9098d4fb am 905da31a: merge from open-source master
Merge commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3'

* commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3':
  Cosmetic fixes in css/js
2009-11-15 11:30:42 -08:00
Jean-Baptiste Queru
905da31a24 merge from open-source master 2009-11-15 10:58:56 -08:00
Jean-Baptiste Queru
96c3892fc0 merge from open-source master 2009-11-11 08:19:07 -08:00
Dan Morrill
8a0625bcb8 Work in progress snapshot of the refreshed content for source.android.com
(formerly PDK).
2009-11-06 14:06:06 -08:00
Scott Main
9a5c840205 docs: make all javadoc reference links use <code>
and remove some unused CSS
2009-11-04 16:12:05 -08:00
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
c72d16092e 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-plus-aosp

* commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00':
  docs: revise resizing scripts to better organize the
2009-11-03 19:13:05 -08:00
Scott Main
d8115ffb22 docs: revise user agent detection to use lower case
for string comparisons and add 'webos' as a mobile device
2009-11-03 18:54:26 -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
598c2e2eba am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-plus-aosp

* commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 18:50:03 -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
f5597885eb 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-plus-aosp

* commit '32b505d984ed15156b87482f849b865892b57ac2':
  docs: fix IE6 bug in which tabs are not focusable
2009-10-30 15:15:00 -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