Scott Main
fd85d42e83
docs: catchup templates to non-merged changes from gingerbread,
...
from Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0, plus
the gingerbread logo
Change-Id: I3864480b9f68679c64747888a6919314f8ac6cbf
2011-01-07 12:40:42 -08:00
Scott Main
6ea057563d
resolved conflicts for merge of 1c4fe5aa to master
...
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
2010-12-06 16:36:53 -08:00
Scott Main
dad569b4e8
docs: fix link
...
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
2010-12-05 18:03:23 -08:00
Scott Main
b73777e56b
docs: revisions to the sdk doc template for preview sdk,
...
remove ndk download table for offline docs
Change-Id: I13da1e5ab825f1d5c6a19ef9a76c36a3edd88bf6
2010-11-22 16:25:09 -08:00
Scott Main
63e9ccd1d6
docs: revise stylesheet to allow "notes" in divs, not just paragraphs
...
Change-Id: Ia78a82dd330a4f31076b74ce86237af3aca1ba2e
2010-11-18 13:54:40 -08:00
Scott Main
19c43fea22
docs: add preliminary watermark to docs
...
Change-Id: Ifc9ea60b53d3e5e52b9cd52174a6d8f0982fe523
2010-11-16 16:24:42 -08:00
Scott Main
9d1d63e2a7
am 1be24531: am badffa84: docs: revise intro to reflect changes to quick start
...
* commit '1be245314ddc88e5bde92e9a0660b1fbbd63422f':
docs: revise intro to reflect changes to quick start
2010-11-08 19:25:01 -08:00
Scott Main
badffa8432
docs: revise intro to reflect changes to quick start
...
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
2010-11-08 16:10:18 -08:00
Scott Main
00c837da0a
am 9f7e7946: am c775c754: docs: add gingerbread logo for homepage
...
* commit '9f7e7946959fa776731283cbef97646b6d9d3013':
docs: add gingerbread logo for homepage
2010-11-06 16:25:09 -07:00
Scott Main
d5c09153a7
am 56c69603: am ec97fd30: docs: revisions to ndk download intro
...
* commit '56c69603adb97e6f0a81874f16d81f538259cd55':
docs: revisions to ndk download intro
2010-11-06 16:24:08 -07:00
Dirk Dougherty
8ad27435f5
Doc change: Merge commit '9561b575' into master
...
Conflicts:
tools/droiddoc/templates-sdk/sdkpage.cs
Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
2010-11-06 16:18:20 -07:00
Scott Main
c775c754f1
docs: add gingerbread logo for homepage
...
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
2010-11-05 14:29:07 -07:00
Scott Main
ec97fd30a6
docs: revisions to ndk download intro
...
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
2010-11-04 21:02:14 -07:00
Robert Ly
706e41e55f
Update the template text for the NDK download page to point to new
...
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
2010-11-04 13:36:37 -07:00
Scott Main
2e94aa25d4
docs: make the resizable side nav standard. DO NOT MERGE.
...
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
2010-11-01 15:53:06 -07:00
Scott Main
f086a6e434
docs: update sdk download template DO NOT MERGE
...
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
2010-10-28 00:21:25 -07:00
Scott Main
9d32bd5b03
docs: css tweak to Ps in sidebox. DO NOT MERGE.
...
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
2010-10-25 17:15:12 -07:00
Scott Main
5466af5017
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
...
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
2010-10-15 11:18:58 -07:00
Joe Onorato
c0bad69b82
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
...
Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f
2010-09-16 14:16:51 -04:00
Joe Onorato
27ce881183
DO NOT MERGE - Remove extra printf
...
Change-Id: I8a2e4fac78010fe531b080d3555557e557c038b9
2010-09-16 12:34:07 -04:00
Joe Onorato
63170ff95d
DO NOT MERGE - Add a -knowntags option to droiddoc
...
This lets us remove the special cases in Comment.java and specify additional
tags to not warn about for the big docs build.
Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d
2010-09-16 11:57:42 -04:00
Joe Onorato
cd7c775ece
fix the build still
...
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
2010-08-31 12:56:49 -07:00
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 f2f3e4b2b6a08f0cd3d05d74b2d65479d77e32
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
