summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* change link for each category in sample side navandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devScott Main2013-10-301-1/+1
| | | | Change-Id: I8e56114be1842bcca7f4373d80392090d2b51964
* merge in KFS78N (no-op)android-cts-4.4_r1kitkat-cts-devEd Heyl2013-10-080-0/+0
|\
| * merge in klp-factoryrom-release history after reset to klp-releaseandroid-4.4_r0.7The Android Automerger2013-09-160-0/+0
| |\
* | \ am 8c33a22b: am aba01a72: Merge "Snip empty group nodes from ↵android-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8kitkat-releasekitkat-cts-releaseDirk Dougherty2013-09-131-9/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | samples_navtree_data so they don\'t show up in TOC." into jb-mr2-docs * commit '8c33a22b7fa09f1bfcb4661caf52a16d1bd8b030': Snip empty group nodes from samples_navtree_data so they don't show up in TOC.
| * \ \ am aba01a72: Merge "Snip empty group nodes from samples_navtree_data so they ↵Dirk Dougherty2013-09-131-9/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don\'t show up in TOC." into jb-mr2-docs * commit 'aba01a728fe2d8f119c908dd9cfad42ee07c1f29': Snip empty group nodes from samples_navtree_data so they don't show up in TOC.
| | * \ \ Merge "Snip empty group nodes from samples_navtree_data so they don't show ↵Dirk Dougherty2013-09-141-9/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | up in TOC." into jb-mr2-docs
| | | * | | Snip empty group nodes from samples_navtree_data so they don't show up in TOC.Dirk Dougherty2013-09-121-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie308229eda29ce812933d7f81f4d07f3669f85af
* | | | | | am 34dd7ccd: am 9a8729a2: update url for sample topic pagesScott Main2013-09-131-1/+1
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | * commit '34dd7ccd9e00466d09be9c68b8191f9381d25b9a': update url for sample topic pages
| * | | | am 9a8729a2: update url for sample topic pagesScott Main2013-09-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '9a8729a253630801f20047b1e0194355b0daa69b': update url for sample topic pages
| | * | | update url for sample topic pagesScott Main2013-09-131-1/+1
| | |/ / | | | | | | | | | | | | Change-Id: Idbe0f7848fc62ea4d2386a1ccf1c813d42db8fe2
* | | | am 07e4bbe9: am 176ad4e0: Add key for group link param.Dirk Dougherty2013-09-121-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '07e4bbe9dada669ff4d492f6f4c19ee66ea3406f': Add key for group link param.
| * | | am 176ad4e0: Add key for group link param.Dirk Dougherty2013-09-121-1/+1
| |\| | | | | | | | | | | | | | | | | | * commit '176ad4e0c2fd47dc60a8facbe880487944f8749b': Add key for group link param.
| | * | Add key for group link param.Dirk Dougherty2013-09-121-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ia731d3f04dfb46271dd6dcc782908601a663df58
* | | | am d723f092: am 84aeec50: Add query-formatted urls for groups in samples ↵Dirk Dougherty2013-09-121-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | navtree. * commit 'd723f092f9ddb68ed50c14715f708d452e42466b': Add query-formatted urls for groups in samples navtree.
| * | | am 84aeec50: Add query-formatted urls for groups in samples navtree.Dirk Dougherty2013-09-121-1/+2
| |\| | | | | | | | | | | | | | | | | | * commit '84aeec506d2845006dd61f2ab39e748b254e9f3b': Add query-formatted urls for groups in samples navtree.
| | * | Add query-formatted urls for groups in samples navtree.Dirk Dougherty2013-09-121-1/+2
| | | | | | | | | | | | | | | | Change-Id: Id84cc5081f740f78dc2d2f9838a295ffb94038b4
* | | | am 492b5fc3: am 56257f3f: Merge "Modify format of samples_navtree_data.js to ↵Dirk Dougherty2013-09-122-15/+63
|\| | | | |_|/ |/| | | | | | | | | | | | | | sort projects group tag." into jb-mr2-docs * commit '492b5fc39737a523a1d4c2d5cef1502446ef3ef1': Modify format of samples_navtree_data.js to sort projects group tag.
| * | am 56257f3f: Merge "Modify format of samples_navtree_data.js to sort ↵Dirk Dougherty2013-09-122-15/+63
| |\| | | | | | | | | | | | | | | | | | | projects group tag." into jb-mr2-docs * commit '56257f3f5266999e251fa4bde22f9495e70032f7': Modify format of samples_navtree_data.js to sort projects group tag.
| | * Merge "Modify format of samples_navtree_data.js to sort projects group tag." ↵Dirk Dougherty2013-09-122-15/+63
| | |\ | | | | | | | | | | | | into jb-mr2-docs
| | | * Modify format of samples_navtree_data.js to sort projects group tag.Dirk Dougherty2013-09-122-15/+63
| | | | | | | | | | | | | | | | Change-Id: I3155cdff749640100436feec6eb9f1cff36a5229
* | | | am 6fa13bb8: am b4d562ba: Normalize values for page.tags. Values can now be ↵Dirk Dougherty2013-09-111-2/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | declared with quotes or not. Multiple values must still be comma delimited. * commit '6fa13bb8340485bb868d26dc76a4faf7492c5df7': Normalize values for page.tags. Values can now be declared with quotes or not. Multiple values must still be comma delimited.
| * | | am b4d562ba: Normalize values for page.tags. Values can now be declared with ↵Dirk Dougherty2013-09-111-2/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | quotes or not. Multiple values must still be comma delimited. * commit 'b4d562baab474d1c96a81cc6dc9e3e3a543a91c2': Normalize values for page.tags. Values can now be declared with quotes or not. Multiple values must still be comma delimited.
| | * | Normalize values for page.tags. Values can now be declared with quotes or ↵Dirk Dougherty2013-09-091-2/+17
| | |/ | | | | | | | | | | | | | | | not. Multiple values must still be comma delimited. Change-Id: I869a0b9ac7b7a9446bddb6560354121def91d186
* | | am 7e78f751: am e52f6d81: Transition sample code projects overviews to ↵Dirk Dougherty2013-09-064-46/+163
|\| | | | | | | | | | | | | | | | | | | | _index.jd. * commit '7e78f751215cf8774be4717b1611418e55383773': Transition sample code projects overviews to _index.jd.
| * | am e52f6d81: Transition sample code projects overviews to _index.jd.Dirk Dougherty2013-09-064-46/+163
| |\| | | | | | | | | | | | | * commit 'e52f6d819e7d95e19e9b315f358bb7ac293413d8': Transition sample code projects overviews to _index.jd.
| | * Transition sample code projects overviews to _index.jd.Dirk Dougherty2013-09-054-46/+163
| | | | | | | | | | | | | | | | | | Support doc-defined hdf metadata as well as make or doclava-defined hdf metadata. Make breadcrumb dirs optionally linkable and generate index files. Change-Id: I0b45868033a1136c87bfae7ecdf5a150c85906a5
* | | am 14f84acc: am 25586c08: Concatenate navtree dirs that hold other dirs ↵Dirk Dougherty2013-09-031-15/+90
|\| | | | | | | | | | | | | | | | | | | | only. Adjust sorting of dir contents. * commit '14f84acc589cdd957415290ab9c41ac47d219785': Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.
| * | am 25586c08: Concatenate navtree dirs that hold other dirs only. Adjust ↵Dirk Dougherty2013-09-031-15/+90
| |\| | | | | | | | | | | | | | | | | | | sorting of dir contents. * commit '25586c08d0a5068159d1c9482f0eaec0d8cc3d50': Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.
| | * Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir ↵Dirk Dougherty2013-09-031-15/+90
| | | | | | | | | | | | | | | | | | contents. Change-Id: I49e67a8ab09bb3b6d411201d4e51a80c477929b4
* | | am a0914e36: am da7497f5: Limit sample code html generator in online mode, ↵Dirk Dougherty2013-08-261-4/+7
|\| | | | | | | | | | | | | | | | | | | | sort file lists by type and name. * commit 'a0914e36a841b0899fa013f8d73a6fd31186f3fc': Limit sample code html generator in online mode, sort file lists by type and name.
| * | am da7497f5: Limit sample code html generator in online mode, sort file ↵Dirk Dougherty2013-08-261-4/+7
| |\| | | | | | | | | | | | | | | | | | | lists by type and name. * commit 'da7497f52aae4ee0daff01cb2db0540dcb8e3fae': Limit sample code html generator in online mode, sort file lists by type and name.
| | * Limit sample code html generator in online mode, sort file lists by type and ↵Dirk Dougherty2013-08-261-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | name. Change-Id: I9d22a1886561bf80d59e433943851fbc2a1df87b Conflicts: src/com/google/doclava/SampleCode.java
* | | am c318bf73: am c11a4671: Sort samples navtree items by type and name. Clean ↵Dirk Dougherty2013-08-261-138/+181
|\| | | | | | | | | | | | | | | | | | | | up page vars to support breadcrumb. * commit 'c318bf738f631407360bc0a468990ec4e40e6fc4': Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.
| * | am c11a4671: Sort samples navtree items by type and name. Clean up page vars ↵Dirk Dougherty2013-08-261-138/+181
| |\| | | | | | | | | | | | | | | | | | | to support breadcrumb. * commit 'c11a467135f9118604f31fadc99d2edd494edb0b': Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.
| | * Sort samples navtree items by type and name. Clean up page vars to support ↵Dirk Dougherty2013-08-261-138/+181
| | | | | | | | | | | | | | | | | | breadcrumb. Change-Id: I83fc8f387df03447f48f1a29b0d68c1868f2bed1
* | | am 08109d83: am 19469c94: Merge "modify markup for sample code blocks to ↵Scott Main2013-08-211-3/+2
|\| | | | | | | | | | | | | | | | | | | | create line numbers w/o a list" into jb-mr2-docs * commit '08109d839d2eac3ed83f6a391a97962550e29483': modify markup for sample code blocks to create line numbers w/o a list
| * | am 19469c94: Merge "modify markup for sample code blocks to create line ↵Scott Main2013-08-211-3/+2
| |\| | | | | | | | | | | | | | | | | | | numbers w/o a list" into jb-mr2-docs * commit '19469c944158507125889909b1c81f5a88524be1': modify markup for sample code blocks to create line numbers w/o a list
| | * Merge "modify markup for sample code blocks to create line numbers w/o a ↵Scott Main2013-08-211-3/+2
| | |\ | | | | | | | | | | | | list" into jb-mr2-docs
| | | * modify markup for sample code blocks to create line numbers w/o a listScott Main2013-08-211-3/+2
| | | | | | | | | | | | | | | | Change-Id: I8d4da266458e1ae281ca5711bf17f0f35bb8511d
* | | | am dd0f0ec8: am ae09006e: Disable generation of sample code html for offline ↵Dirk Dougherty2013-08-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | docs builds. * commit 'dd0f0ec82398191050e45fb98d32ffedb028d7b9': Disable generation of sample code html for offline docs builds.
| * | | am ae09006e: Disable generation of sample code html for offline docs builds.Dirk Dougherty2013-08-211-1/+1
| |\| | | | | | | | | | | | | | | | | | * commit 'ae09006e30c95b33931ba8127dad7474815ca58b': Disable generation of sample code html for offline docs builds.
| | * | Disable generation of sample code html for offline docs builds.Dirk Dougherty2013-08-211-1/+1
| | |/ | | | | | | | | | Change-Id: I2b17622ac1c98da5c8ebde96c4b1b3d563164d69
* | | am 20a64d87: am 1b45d1d0: doc change: Samples browsing: starter templates ↵Dirk Dougherty2013-08-205-30/+372
|\| | | | | | | | | | | | | | | | | | | | and navtree gen support. * commit '20a64d87333ff1ca51337d82f09695063e4964e7': doc change: Samples browsing: starter templates and navtree gen support.
| * | am 1b45d1d0: doc change: Samples browsing: starter templates and navtree gen ↵Dirk Dougherty2013-08-205-30/+372
| |\| | | | | | | | | | | | | | | | | | | support. * commit '1b45d1d08a4ff984e1d0741dd13f0759f6527ebf': doc change: Samples browsing: starter templates and navtree gen support.
| | * doc change: Samples browsing: starter templates and navtree gen support.Dirk Dougherty2013-08-205-30/+372
| | | | | | | | | | | | Change-Id: I03f5eec1dcb71e96fed2ba0119a0b2c0bba56f49
* | | am 09ce528e: am 18904806: fix doclava to tag enums with \'since\' infoScott Main2013-08-132-1/+12
|\| | | | | | | | | | | | | | * commit '09ce528ec5786254f6f1af6359c344d673ca80ad': fix doclava to tag enums with 'since' info
| * | am 18904806: fix doclava to tag enums with \'since\' infoScott Main2013-08-132-1/+12
| |\| | | | | | | | | | | | | * commit '189048062a7df2d2fba4ff075c6416bfbf05a094': fix doclava to tag enums with 'since' info
| | * fix doclava to tag enums with 'since' infoScott Main2013-08-132-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for the output to behave properly, this CL depends on the following change that adds the enum values to the public API list for all API levels lower than 14. I1f88e8f9f3e2655d17eea628611318e207cbb535 bug: 10220616 Change-Id: I424e71d8a8b69c1c348e10b60b60f77aa0b2468d
* | | Add Gradle build file to make Doclava.Adam Metcalf2013-07-301-0/+29
|/ / | | | | | | Change-Id: I6148ca5b215ab6dd8d4e9a5cef8e63d29668d232
* | am 73609593: Merge "Check that return types are assignable instead of exact."tools_r22.2Elliott Hughes2013-06-137-19/+87
|\ \ | | | | | | | | | | | | * commit '736095934f50fede95f2cb1bb54cc24493c6e69a': Check that return types are assignable instead of exact.