Commit graph

528 commits

Author SHA1 Message Date
Joe Onorato
0ee89a72d5 DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
2010-08-31 12:00:44 -07:00
Dirk Dougherty
d77248ac7e Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround.
Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
2010-08-31 10:13:25 -07:00
Bill Napier
10cd7f9969 DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3
2010-08-25 10:00:20 -07:00
Bill Napier
0e143c0ed9 Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.

Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
2010-08-24 22:16:01 -07:00
Ben Dodson
07aebf322a Continue to use search.html for site searching
Change-Id: I0e3ef90698c2ac06693eb70f140b26b476d51a22
2010-08-24 17:13:08 -07:00
Ben Dodson
c67e4cb8a1 Updates for new doclava customizations
Change-Id: I98f45e3fe92953968014b2d6589515ca39a5c920
2010-08-24 16:14:18 -07:00
Ben Dodson
d3191f0d71 Adding android-specific customization for warning of minimum api level
Change-Id: Id211e250f3c42d0239ce9bf126a74997c8b0dc3f
2010-08-24 14:39:58 -07:00
Ben Dodson
e7a6af9fe0 Merge "Synchronizing templates with doclava's external ones." 2010-08-17 14:40:42 -07:00
Ben Dodson
5846ec74cc Removed unused source files. Apicheck and droiddoc are now in external/doclava.
Change-Id: I13bcdbd27214e15235fa9687b6f15f8853f5f448
2010-08-17 11:04:56 -07:00
Ben Dodson
4dbb28ad29 Synchronizing templates with doclava's external ones.
Change-Id: Ida95fd6e2f4eb30fbc9200f585aed9dd20996f78
2010-08-10 18:34:21 -07:00
Ben Dodson
1034455a24 Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava
Change-Id: If317bd108043b152d28babc88a7c949db5127a93
2010-08-05 15:45:10 -07:00
Scott Main
cecf0bee67 am 240782f2: am 6eea9363: am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3'

* commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3':
  update carousel icon for nexus one dev phone
2010-08-05 15:25:15 -07:00
Scott Main
aee274ed4e am b7256fd6: am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit 'b7256fd6851d90c088b8cc1603fa62faa95714de'

* commit 'b7256fd6851d90c088b8cc1603fa62faa95714de':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:25:12 -07:00
Scott Main
6eea9363f4 am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread

* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
  update carousel icon for nexus one dev phone
2010-08-05 15:10:05 -07:00
Scott Main
be4696e073 am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread

* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:10:03 -07:00
Scott Main
4f2436dc35 update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
2010-08-05 09:44:47 -07:00
Brian Carlstrom
7dc35a3b9c Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Dirk Dougherty
35e642f768 Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
2010-07-23 14:39:41 -07:00
Scott Main
bee4915392 am 21bd43a3: am 81f42236: am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '21bd43a3d9600f25a1d52bde639e0d701cfa86f2'

* commit '21bd43a3d9600f25a1d52bde639e0d701cfa86f2':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 23:21:04 -07:00
Scott Main
9269a71175 docs: ensure code-ified links in qv are the proper color
Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7
2010-07-15 11:21:56 -07:00
Scott Main
ec06d42152 am b0b2146b: am 38d2e1da: am b66a5c05: docs: modify redirect link text
Merge commit 'b0b2146bb7017c8f1b91ff4a4d05ed64a2b3a20f'

* commit 'b0b2146bb7017c8f1b91ff4a4d05ed64a2b3a20f':
  docs: modify redirect link text
2010-07-08 19:10:07 -07:00
Scott Main
b66a5c0574 docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
2010-07-08 11:34:45 -07:00
Scott Main
45e4685a7e am 7e5592c7: am 62c65665: am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '7e5592c703964c35a177c8f4514c4a9eb2135344'

* commit '7e5592c703964c35a177c8f4514c4a9eb2135344':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:16:36 -07:00
Scott Main
81b68ad95d Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo 2010-06-24 18:10:32 -07:00
Scott Main
a1b358a22c docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS

Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
2010-06-24 17:57:50 -07:00
Roman Nurik
78eff9f5bd Revamp resources listing, part 2 (droiddoc).
- Fix docs navigation JS to correctly handle pages with query strings (i.e. browser.html?tag=article)
- Add resource browser CSS and JS to complement browser.jd in frameworks/base.
- Add microtemplate.js library for ease HTML templates in JS.

Change-Id: I518eeb5fc5a05dc6775eb3870eb88ebb0fc7b72c
2010-06-04 10:51:02 -07:00
Elliott Hughes
5479d77e32 Work around a bug with <T> ... <? extends T[]> methods.
Java 6 adds an Arrays.copyOf method that confuses droiddoc into producing
a class "Array" in the anonymous package. I've raised a bug for someone
to work out why and fix this properly (after spending a fairly fruitless
afternoon on it). This work-around filters that out the cruft. I've checked
the generated current.xml file and the generated java.util.Arrays stubs,
and they're both correct. The extent of droiddoc's confusion appears to be
limited to inventing a non-existent class. (My guess is that it doesn't
realize that the element type of the array is a type parameter, not a type,
and it ends up using a default type name of "Array" from somewhere [javadoc
itself?].)

Bug: 2715505
Change-Id: I2ad7ecc819e320a1d209720b3dfbef45bbd89877
2010-05-26 11:41:33 -07:00
Scott Main
ab90d31c2b am 168cd06c: am 9589164c: am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo mark for home" 2010-05-25 12:36:20 -07:00
Scott Main
ca671ab7a6 Revert "Doc change: Update froyo mark for home"
This reverts commit 9d1d6441d9.
2010-05-25 12:22:29 -07:00
Dirk Dougherty
b510ff8163 am 4856af65: am 90fa8093: am d44754e0: am e9b01eb4: Doc change: add tv assets for carousel. 2010-05-20 00:20:56 -07:00
Dirk Dougherty
e9b01eb46d Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
2010-05-19 19:42:12 -07:00
Dirk Dougherty
4ad0ca603b am 4150816f: am 5caaeadb: am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark for home 2010-05-19 19:02:26 -07:00
Dirk Dougherty
9d1d6441d9 Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
2010-05-19 18:25:33 -07:00
Dan Morrill
899001748e Changing the footer per legal guidance.
Change-Id: Ia20e3b1a69265e1ffe0b50993be12dcd96afa05f
2010-05-18 08:10:14 -07:00
Scott Main
0f28a15755 am 68ed2f54: am 758c0f34: am de14ee57: am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected 2010-05-10 10:30:58 -07:00
Scott Main
3494d9b3de docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
2010-05-10 10:01:13 -07:00
Scott Main
dae84581a3 am f44f71c2: am dbd7b38e: am 9096ef38: am 3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo 2010-05-10 09:54:01 -07:00
Scott Main
ae98747d7c add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
2010-05-06 11:43:08 -07:00
Scott Main
c621843d82 am 41e5e60b: am ac06ea78: am e59de21b: am 74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td 2010-05-05 11:07:55 -07:00
Scott Main
74108deaf1 fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td

Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
2010-05-04 17:24:26 -07:00
Scott Main
2dfe398a29 am 1053592f: am e611eef0: am c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo 2010-04-27 18:56:45 -07:00
Scott Main
7f418a518b support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct

Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
2010-04-23 11:41:30 -07:00
Scott Main
475089cc25 am 19ca463e: am 55f1fca1: am d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell 2010-04-20 17:46:25 -07:00
Scott Main
c1d74726cb am 6f467f62: am e3e590be: am f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo 2010-04-20 15:52:32 -07:00
Scott Main
d72731d213 docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell

Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
2010-04-20 15:35:49 -07:00
Scott Main
f655dab5e6 Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo 2010-04-20 15:34:22 -07:00
Roman Nurik
af23298447 cherry-pick from master: 42092024eb
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.

Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
2010-04-19 15:18:41 -07:00
Roman Nurik
e01d8a70d5 Merge "Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive." 2010-04-19 14:34:13 -07:00
Roman Nurik
42092024eb Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.
Change-Id: Ifa52bb48c7b03c9aa7ad03cfe3e0049024f71a8d
2010-04-19 14:28:18 -07:00
Scott Main
7a0090b316 docs: add script to capture the ctrl+f key event (initiates 'find' search
on the page) and expand all inherited members.

Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.

Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6
2010-04-16 09:05:06 -07:00
Wu-cheng Li
05a119ea27 am d31ae2fc: am 8b687440: am fcc7cf77: Fix the check of double quoted @see tag. 2010-04-13 16:22:33 -07:00
Dan Morrill
6d30b72be1 Removing unnecessary tabs, and fixing an IE bug.
Change-Id: I055243ebd47c9319333aa837061015650d57d923
2010-04-13 14:51:28 -07:00
Wu-cheng Li
fcc7cf7799 Fix the check of double quoted @see tag.
Originally \n was not discarded so a balanced quoted string still
has compile error.

bug:2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a
2010-04-13 23:49:18 +08:00
Scott Main
7b6cee7653 cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class

Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30
2010-04-08 17:32:02 -07:00
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
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
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
Scott Main
a42091e426 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-plus-aosp

* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-27 17:50:58 -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
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
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
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
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
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
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
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
60dba89451 docs: add eclair logo for homepage 2009-10-23 12:22:42 -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
3d3d7b7efd doc change: template changes for new SDK doc structure.
Bug:2160782
2009-10-21 19:52:52 -07:00
Dirk Dougherty
fce6b45f62 doc change: template/asset changes for sdk package. 2009-10-16 17:14:33 -07:00
Android (Google) Code Review
dc54d239a2 Merge change I29b5b2d9
* changes:
  Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-13 11:51:30 -04:00
Scott Main
67484da8a7 am b268d30a: am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289'

* commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289':
  docs only.
2009-10-12 11:41:10 -07:00
Gaurav Mathur
29b5b2d94f Add new tabs for Compatibility and Get Source to source.android.com framework 2009-10-08 23:54:35 -07:00
Scott Main
5f0241f5d8 am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair

* commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
  docs only.
2009-10-06 10:14:01 -07:00
Scott Main
37bfad5ce8 docs only.
fix FF2 browser bug in header layout

http://b/2031559

Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
2009-10-06 09:27:10 -07:00
Scott Main
07dc76fee2 am 95035daf: am 39715e2f: Merge change I962d468d into eclair
Merge commit '95035daffba91e776734c927c01d104c4478bd9e'

* commit '95035daffba91e776734c927c01d104c4478bd9e':
  revise the deprecated warning to use the 'caution'
2009-10-01 12:22:34 -07:00
Dirk Dougherty
dfea61dedb am 8fd5fb34: am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut
Merge commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'

* commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
  Add NDK version reference to template.
2009-10-01 12:13:30 -07:00
Android (Google) Code Review
39715e2f3d Merge change I962d468d into eclair
* changes:
  revise the deprecated warning to use the 'caution' style and add a line break
2009-09-30 18:23:08 -04:00
Scott Main
962d468d73 revise the deprecated warning to use the 'caution'
style and add a line break
2009-09-30 14:37:32 -07:00
Dirk Dougherty
96dcc3a98e am 7259bae0: Merge change Ied94685e into donut
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair

* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
  Add NDK version reference to template.
2009-09-30 11:32:09 -07:00
Android (Google) Code Review
7259bae08d Merge change Ied94685e into donut
* changes:
  Add NDK version reference to template.
2009-09-29 11:43:24 -04:00
Scott Main
249be1036a am dfa9bc7a: am 6159eead: am afdb6feb: Merge change 27127 into donut
Merge commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c'

* commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c':
  docs only.
2009-09-27 15:40:02 -07:00
Scott Main
6159eead22 am afdb6feb: Merge change 27127 into donut
Merge commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba' into eclair

* commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba':
  docs only.
2009-09-25 15:00:40 -07:00
Android (Google) Code Review
afdb6feb9b Merge change 27127 into donut
* changes:
  docs only. inherit the line height to resolve vertical scroll issue in WebKit browsers
2009-09-25 17:48:11 -04:00
Scott Main
18a4883ab3 docs only.
inherit the line height to resolve vertical scroll
issue in WebKit browsers

Change-Id: I1707893614e3983e6b53a31229b3e19e584d6950
2009-09-25 14:38:33 -07:00
Scott Main
20bd674021 am 93c80c4f: am 0c44a2a9: am ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707'

* commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707':
  adds a parameter to the URL hash on all search queries.
2009-09-25 11:25:14 -07:00
Scott Main
46a39b74a7 am 207ce1fc: am b91916b4: docs only. change the SDK tab to point to the release notes in offline mode; hide all other languages by default instead of depending on the stylesheet
Merge commit '207ce1fce5099ac7da18c28f63519d6103a1db32'

* commit '207ce1fce5099ac7da18c28f63519d6103a1db32':
  docs only.
2009-09-25 11:16:38 -07:00
Scott Main
1e7ee1a568 am 4dc826b7: am 389cdb7a: Merge change 26258 into eclair
Merge commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7'

* commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7':
  docs only.
2009-09-25 11:10:25 -07:00
Scott Main
0c44a2a9f3 am ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5' into eclair

* commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5':
  adds a parameter to the URL hash on all search queries.
2009-09-25 09:15:00 -07:00
Scott Main
ad4d4efac4 adds a parameter to the URL hash on all search queries.
depends on change 3583, in order to handle the new parameter

Change-Id: I86ead029371615243cfd809bd7cb2a2f2830c4be
2009-09-24 20:41:29 -07:00
Scott Main
b91916b414 docs only.
change the SDK tab to point to the release notes in offline mode;
hide all other languages by default instead of
depending on the stylesheet
2009-09-24 19:50:56 -07:00
Dirk Dougherty
5c450ed169 Add NDK version reference to template.
Change-Id: Ied94685e7c8dde2eab4f708d30cbf2757cea10d5
2009-09-23 17:31:16 -07:00
Scott Main
29f9e1aa63 docs only.
remove Home tab from offline docs and make
SDK tab point to new offline welcome page;
hide all other languages by default instead of
depending on the stylesheet
2009-09-21 14:50:19 -07:00
Scott Main
a5a849aee7 am b66f9b3e: am 9958256b: am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit 'b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e'

* commit 'b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e':
  docs only.
2009-09-17 12:45:36 -07:00
Scott Main
9958256b20 am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '1da823869ccbc5f848cdd35d52d1630886288446' into eclair

* commit '1da823869ccbc5f848cdd35d52d1630886288446':
  docs only.
2009-09-17 12:29:05 -07:00
Scott Main
1da823869c docs only.
use normal DOM mod instead of jquery to load the lists.js
file because jquery was appending GET parameters that
eliminated any caching of the file.

Change-Id: I926ef8c164ba81d040256accaf78883807c3b57e
2009-09-17 10:54:05 -07:00
Dirk Dougherty
107662f637 am f2ffc366: am 60bbe187: am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288'

* commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288':
  Change sdk doc template so that ADT download link bypasses clickthrough.
2009-09-17 09:57:12 -07:00