History log of /external/doclava/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
07f1dae3b9a9d8222ffa18e2d878c27c01c6268f 03-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
5624eba1aeb5c28b4d13f324f0eb6eccd6afd1cd 02-Feb-2015 Jeff Arneson <jarneson@google.com> am d71cda54: am a1c4e3c3: Fix a syntax error in the link rendering macro

* commit 'd71cda5440383925192953226deb316fabebf605':
Fix a syntax error in the link rendering macro
d71cda5440383925192953226deb316fabebf605 02-Feb-2015 Jeff Arneson <jarneson@google.com> am a1c4e3c3: Fix a syntax error in the link rendering macro

* commit 'a1c4e3c3f512c972823b0076303400489cb16abf':
Fix a syntax error in the link rendering macro
a1c4e3c3f512c972823b0076303400489cb16abf 02-Feb-2015 Jeff Arneson <jarneson@google.com> Fix a syntax error in the link rendering macro

Change-Id: Ifedeaeee9230ea1eea5585046e4ece0483011391
es/assets/templates/macros.cs
b67b6892d1eeaa9e27719c8bb20524550addd4a0 19-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
8ff37cab9a5691188d26ccd29f98dd3b1ab05329 16-Jan-2015 Dirk Dougherty <ddougherty@google.com> am 07460a4e: am 9bb67673: Support new Analyze subtab under Distribute.

* commit '07460a4e381c16753f94083b817f401eb76c2bf3':
Support new Analyze subtab under Distribute.
07460a4e381c16753f94083b817f401eb76c2bf3 16-Jan-2015 Dirk Dougherty <ddougherty@google.com> am 9bb67673: Support new Analyze subtab under Distribute.

* commit '9bb6767395b15d8f7762dd226eb85a219950f2a1':
Support new Analyze subtab under Distribute.
9bb6767395b15d8f7762dd226eb85a219950f2a1 08-Jan-2015 Dirk Dougherty <ddougherty@google.com> Support new Analyze subtab under Distribute.

Change-Id: Ic9142800c65d59418ab4036d0a86d904e5b07527
rc/com/google/doclava/DocFile.java
3bbaa02b9c253e6a4f8a4fbe7f97236a49a08121 13-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
47485edf9b85f433682ec401d2ad8868821d08ce 12-Jan-2015 Jeff Arneson <jarneson@google.com> am d4c4946f: am f798f20a: Fix href in @linkplain links when not on the federated site

* commit 'd4c4946ffdd2c38741ac630b8c47da86b3c40475':
Fix href in @linkplain links when not on the federated site
d4c4946ffdd2c38741ac630b8c47da86b3c40475 12-Jan-2015 Jeff Arneson <jarneson@google.com> am f798f20a: Fix href in @linkplain links when not on the federated site

* commit 'f798f20ade2fa2361f7561d77b2f3fdb0345ebf5':
Fix href in @linkplain links when not on the federated site
f798f20ade2fa2361f7561d77b2f3fdb0345ebf5 08-Jan-2015 Jeff Arneson <jarneson@google.com> Fix href in @linkplain links when not on the federated site

Bug: 18945445
Change-Id: I6c5ae6efc16f747470c4ab21076b030a32335f20
es/assets/templates/macros.cs
c0d951d886197a4bd10f960c70e03854210caae1 07-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
ed1d5da3bbe7d9d9b26104c9ac76ce92b18ed10b 07-Jan-2015 Jeff Arneson <jarneson@google.com> am ed3de62f: am 92393f10: Render @linkplain links in regular font rather than code font

* commit 'ed3de62f999dfa2b4d9ee3c55919fa63059fb3c6':
Render @linkplain links in regular font rather than code font
ed3de62f999dfa2b4d9ee3c55919fa63059fb3c6 06-Jan-2015 Jeff Arneson <jarneson@google.com> am 92393f10: Render @linkplain links in regular font rather than code font

* commit '92393f10b7c1922425d8c4c77df5dd35a6d145ed':
Render @linkplain links in regular font rather than code font
92393f10b7c1922425d8c4c77df5dd35a6d145ed 05-Jan-2015 Jeff Arneson <jarneson@google.com> Render @linkplain links in regular font rather than code font

BUG: 18499941
Change-Id: Ic53fc04ddfff2a5fbf83bc8eb68b423f9e68eded
es/assets/templates/macros.cs
rc/com/google/doclava/Comment.java
cbd2562820409c2e6cee54daa5bb218b88b188b8 05-Dec-2014 Jeff Arneson <jarneson@google.com> am 147b50b6: am 2e055d0e: DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters

* commit '147b50b6cac45f23c3ca0229bf24a5a4e85c4d37':
DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters
147b50b6cac45f23c3ca0229bf24a5a4e85c4d37 04-Dec-2014 Jeff Arneson <jarneson@google.com> am 2e055d0e: DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters

* commit '2e055d0e61fdda6b791bdcb076419310a31c24d8':
DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters
f689aab4077e282d80b4fc1c8350aebd5dd2f125 03-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
2e055d0e61fdda6b791bdcb076419310a31c24d8 29-Oct-2014 Jeff Arneson <jarneson@google.com> DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters

The type paramater data was being lost on interfaces and base classes
when iterating through the hierarchy. This is fixed by passing along
TypeInfos that keep track of the parameterized types to the superclasses,
interfaces, and methods in the inheritance chains.

Bug: 18078691
Change-Id: I8a614e6f51862c5550766d58e33205040dab3dfb
(cherry picked from commit d6570b0b7f66519ba50c18d9e08db423bdf1341e)
es/assets/templates/macros.cs
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/ParameterInfo.java
rc/com/google/doclava/TypeInfo.java
d6570b0b7f66519ba50c18d9e08db423bdf1341e 29-Oct-2014 Jeff Arneson <jarneson@google.com> Fix docs for classes that implement or extend generics with type parameters

The type paramater data was being lost on interfaces and base classes
when iterating through the hierarchy. This is fixed by passing along
TypeInfos that keep track of the parameterized types to the superclasses,
interfaces, and methods in the inheritance chains.

Bug: 18078691
Change-Id: I8a614e6f51862c5550766d58e33205040dab3dfb
es/assets/templates/macros.cs
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/ParameterInfo.java
rc/com/google/doclava/TypeInfo.java
01c0b34c49bdf89f0ee1f5491ee64d3de9e9f5a2 08-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
3f6120d03a0799607f7e98d63cbe28381c262da3 06-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
3101a4f66fe39f8f3a7be74dbe56a63f4e085de6 05-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
698374e52765ebf007ed69bb39cb7013ad942ff1 04-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
0212b3ac719a98d6942cb72218c2ee3203cdaeb4 03-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
bfd3489ffdf0def089920c36eb0429583d24d1c2 02-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
0e0b56b4a7065a74572faa2d66dd264dd830b6fe 01-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
740a1f48449b3175152dd6fc38e4ba36b82ccecc 30-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d 29-Oct-2014 Ying Wang <wangying@google.com> Add generics to the field types in the API file. automerge: 5db09cd
automerge: 5787d1d

* commit '5787d1d37567e027bc790f5b2c6855400b32f84a':
Add generics to the field types in the API file.
b456f6d2d68619a03ceec07284d34cc889bc4042 29-Oct-2014 Ying Wang <wangying@google.com> Add generics to the field types in the API file.
automerge: 1e62346

* commit '1e62346e7cb16254b31877f30741cd30637b043f':
Add generics to the field types in the API file.
7d4c12b582a46f58ebed13b2ba7451a172ff63ec 29-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 7751817561b5fea6ffaee8cad497ab6876deca0e
497bc824f56abf73e917326513ce61bc7ddcf129 28-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 7751817561b5fea6ffaee8cad497ab6876deca0e
5787d1d37567e027bc790f5b2c6855400b32f84a 28-Oct-2014 Ying Wang <wangying@google.com> Add generics to the field types in the API file.
automerge: 5db09cd

* commit '5db09cd932e64b0c160cac4fdf162d225b220e5a':
Add generics to the field types in the API file.
7751817561b5fea6ffaee8cad497ab6876deca0e 15-Aug-2014 Ying Wang <wangying@google.com> Add generics to the field types in the API file.

Bug: 17014855
Change-Id: Id014329254613f04adcb33cd46a2d4930f0c1d91
(cherry picked from commit 5db09cd932e64b0c160cac4fdf162d225b220e5a)
rc/com/google/doclava/Stubs.java
1e62346e7cb16254b31877f30741cd30637b043f 15-Aug-2014 Ying Wang <wangying@google.com> Add generics to the field types in the API file.

Bug: 17014855
Change-Id: Id014329254613f04adcb33cd46a2d4930f0c1d91
(cherry picked from commit 5db09cd932e64b0c160cac4fdf162d225b220e5a)
rc/com/google/doclava/Stubs.java
d31ee1347707c9d2a2baaf7e031c6e32cce70ee6 27-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
0cd6e227003cdff104a645ed35059d2bb619c058 26-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
b293216bca385b0f5b72da3fadd8c7b1998af102 25-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
75cb3c4180957929221e39a0521595634fc0700e 23-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
531bdac088d2b458fabc03c993ef1cdfd546320a 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
748535ae910eaefbb2ee138201d6405ae797a2b7 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
5db09cd932e64b0c160cac4fdf162d225b220e5a 15-Aug-2014 Ying Wang <wangying@google.com> Add generics to the field types in the API file.

Bug: 17014855
Change-Id: Id014329254613f04adcb33cd46a2d4930f0c1d91
rc/com/google/doclava/Stubs.java
e4ba175835cc890abd0781b124488eae2a270bb7 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
5a62f5ebd117b9f2198c85d9fb1aecbf1e25cd4c 19-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
38d1037e98f9e8b6ab5e38eba99bce88a2f0dc75 18-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
d252e3499d4b8886d5ea768265b27993a16a5097 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
9aff12dadb0a514089423bb95e41448d518e633d 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51 08-Oct-2014 Jeff Arneson <jarneson@google.com> Inner classes export showAnnotations from their containing class

Updated the makeHDF methods on ClassInfo to grab showAnnotations
recursively from the containing classes if they exist.
getAnnotationsIncludeOuters is the helper method to do this.

Nothing was changed about deciding visibility of said inner classes,
as it seems to work really well already.

Change-Id: Idbe7a2ee8fd5c455bb08bb3e53424630ec772267
Bug: 17900353
rc/com/google/doclava/ClassInfo.java
d4d9a72436ac680f7c6f459d43d7ccfba1c9dbc9 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
83a562a487b66ea50a1c9382ec28845583dfb91f 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
ebb875c4154b1b31613f5aad35cde3522a9264bc 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
3056a35b47c50a7c3057ad8bd00b1fb3d536d8d3 11-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
d0c3200c4cfe4461c9c4d7d276c4195128e92d7a 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
b455ad0d76ceb7f87990d494dc4802101b27a662 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
75aae0e87144e672d64d844955a88dbfd91ed39d 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
0a899734ec948ca154c72d90ae9e0966641b2b40 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
6ac8b55058fd0e2cd194843f76d5bb61329d43df 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
d57fd7a8dd5ca4c7953bfd5a2010176c99917d27 04-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
5aa1cf6166441e2a89c68be22cccae05366fb6eb 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
f2f9533af46b97154701ef2ace77c0f7d2298f08 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
b2e1260f94c7d3e6034c1244e7c6f9144544ac5b 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
8db83816694d1d15f6a6351b45746f928548402a 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
2ff12590594d6c6f8ade28767a2ede53b6cd34d2 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
1fad723e9800df8df4986397981e5b4dcc859ef4 27-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
e1643aca258cfadc0bda0fea1d3ab0452d677161 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
a1e1ff77546e58c6ba32f568ec8748b76f1d48a8 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
c96ed0e8c34495ed13adca287cbf76c725dbc43b 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
ee75cc847767961768956ace28a8e77140375506 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
73b8b64c914fc06973571c2d96615d1abf38b924 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
ecddbd26b33520803fe6e35fa943dc3de2dcdd94 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
bd5077663e9439a5e86d2f2572b9889653fe880b 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
5f6e4713451678c6b54b7752f68b8f85ad587b78 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
6d5fbd366769860d0d40b042b18278814061d9ec 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4e67d82e0697805122796afec21f46e544eb309c
6e123609d5288fbcf9bfea033fbd8992a24af5eb 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to e9b211d38b396a01121954223e56a4ef193b4ea5
4e67d82e0697805122796afec21f46e544eb309c 11-Sep-2014 Jeff Arneson <jarneson@google.com> Export showAnnotations on fields to HDF

Change-Id: I6cb0f02b6b1ff61aa845d1cb1a8d040a7ddea191
rc/com/google/doclava/FieldInfo.java
e9b211d38b396a01121954223e56a4ef193b4ea5 09-Sep-2014 Jeff Arneson <jarneson@google.com> Merge "DO NOT MERGE Spit out annotations used in showAnnotations param" into lmp-dev
e64dc94c3548aba038c89438fc9fb492dc678c48 08-Sep-2014 Sergei Datsenko <dats@google.com> Fix incorrect proguard keepfile generation for fields.

Field's type for an array was being printed with extra "[]" at the end.
E.g. "int[][]" instead of "int[]".

Change-Id: I27a915b74a4d996b3ac04840b825e8c2ffd13e4e
rc/com/google/doclava/Stubs.java
b84c41b0cd0531aa83f51a791d7457b4819bee7a 13-Aug-2014 Jeff Arneson <jarneson@google.com> DO NOT MERGE Spit out annotations used in showAnnotations param

Update Class, Member, and Method infos to track what annotations
were used to bypass @hide and the like. Pass those out as an
array to be rendered in the HTML.

Bug: 16848303
Change-Id: I98ebc574d4b8eaaa1134e260518ddc2ddd43f99f
(cherry picked from commit 051dace82cf6a43923b17f95974d93a23ed3dd87)
rc/com/google/doclava/AnnotationInstanceInfo.java
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/MemberInfo.java
rc/com/google/doclava/MethodInfo.java
2177599f538d80833a06783e7d272f97dc941481 18-Aug-2014 Renato Mangini <mangini@google.com> am 4e08da2c: am e11680d4: Change Doclava to support multimodule samples

* commit '4e08da2c90694f726e3944f99141d7d783dd6924':
Change Doclava to support multimodule samples
4e08da2c90694f726e3944f99141d7d783dd6924 16-Aug-2014 Renato Mangini <mangini@google.com> am e11680d4: Change Doclava to support multimodule samples

* commit 'e11680d498d71b1503b77a5137bd67492dee0c58':
Change Doclava to support multimodule samples
e11680d498d71b1503b77a5137bd67492dee0c58 15-Aug-2014 Renato Mangini <mangini@google.com> Change Doclava to support multimodule samples

Doclava only recognizes samples as browseable projects if they contain both
an _index.jd file and a src/ directory on their root directories. This CL
relaxes this rule by allowing the src/ to be inside a top level director as
well, so samples with multiple modules, like Wear apps, can be browsed.

Bug: 17042843

Change-Id: I2bcebb1dc3b2d317b43ff4af379c761067535bd9
rc/com/google/doclava/Doclava.java
53d13be6dc155a3d7ae0607f3eafc2c3b98a909f 25-Jun-2014 Florian Uunk <feuunk@google.com> Fixes for generating APIs that use external libraries.

Two fixes:
- Add stubs for interfaces that are outside of the codebase
- Consider interfaces that are outside of the codebase for API
consistency

Change-Id: Ia4c5a7ec92d169d519d7d580ae36dd60f480dabc
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/apicheck/ApiInfo.java
39be9e8470ac38baab65cfe8d7e3fa61640ea275 22-Jun-2014 Dirk Dougherty <ddougherty@google.com> am c2a0df55: (-s ours) am 80e27611: am e1951c7a: Add new docs build flag -briefdocs that builds the docs and resolves jd links but doesn\'t output reference or browsable samples pages.

* commit 'c2a0df553481b53062202d76b3358f797436a491':
Add new docs build flag -briefdocs that builds the docs and resolves jd links but doesn't output reference or browsable samples pages.
c2a0df553481b53062202d76b3358f797436a491 21-Jun-2014 Dirk Dougherty <ddougherty@google.com> am 80e27611: am e1951c7a: Add new docs build flag -briefdocs that builds the docs and resolves jd links but doesn\'t output reference or browsable samples pages.

* commit '80e276116a8c4183444b8c89297daa054d53bf9d':
Add new docs build flag -briefdocs that builds the docs and resolves jd links but doesn't output reference or browsable samples pages.
80e276116a8c4183444b8c89297daa054d53bf9d 21-Jun-2014 Dirk Dougherty <ddougherty@google.com> am e1951c7a: Add new docs build flag -briefdocs that builds the docs and resolves jd links but doesn\'t output reference or browsable samples pages.

* commit 'e1951c7ae0c084a54990ef853a21987eea637d2a':
Add new docs build flag -briefdocs that builds the docs and resolves jd links but doesn't output reference or browsable samples pages.
ce95875e3efabc3a45dcb81ca38f03c7b342a378 11-Jun-2014 Robert Ly <robertly@google.com> am 56fb0202: am 32f2de2c: changes to support microsites

* commit '56fb0202496dea30efe9515aaff4945355412614':
changes to support microsites
b572d3ca3f641f754673dc0a0cf1b5183ee4dffd 11-Jun-2014 Deepanshu Gupta <deepanshu@google.com> am df8d48b6: Ensure LayoutParams in widgets.txt are in correct package.

* commit 'df8d48b6dab0a1d5f354266e6617877f177894cf':
Ensure LayoutParams in widgets.txt are in correct package.
56fb0202496dea30efe9515aaff4945355412614 11-Jun-2014 Robert Ly <robertly@google.com> am 32f2de2c: changes to support microsites

* commit '32f2de2c795891219f436d3128b37bee70656c7f':
changes to support microsites
df8d48b6dab0a1d5f354266e6617877f177894cf 11-Jun-2014 Deepanshu Gupta <deepanshu@google.com> Ensure LayoutParams in widgets.txt are in correct package.

If a super class of LayoutParams is not in android.view or
android.widget, it can caus a NPE in the ADT. Do not add such
LayoutParams to the widgets.txt file.

Change-Id: I7878877b79f2e0e872cc06747f0f5e25f76bb17d
rc/com/google/doclava/Doclava.java
cbc60decb8169f18422c25ae8a384e5d91cdfe74 04-Jun-2014 Alex Klyubin <klyubin@google.com> Support marking packages as hidden via command-line.

This adds support for marking specific packages as hidden via
command-line switch hidePackage. This is useful when the package in
question cannot be marked with @hide, for example, because the
package name in .class file is different from package name in source
file, or because the package may need to be visible in another body
of documentation.

Bug: 15073623
Change-Id: Iffcf5f3d50cc8db25a3bbfb244ce74c287e3875f

(cherry-picked from 725c7378bf129464c118c636dbaef92ef2df993e)

Conflicts:
src/com/google/doclava/PackageInfo.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PackageInfo.java
fcca716d6d00a1c827874284ae3ac627c4843277 06-Jun-2014 Alex Klyubin <klyubin@google.com> am 164bbd75: (-s ours) am b9d279d8: Merge "Support marking packages as hidden via command-line."

* commit '164bbd75087fcd3d6ab2a774dfb06c469be399e3':
Support marking packages as hidden via command-line.
164bbd75087fcd3d6ab2a774dfb06c469be399e3 06-Jun-2014 Alex Klyubin <klyubin@google.com> am b9d279d8: Merge "Support marking packages as hidden via command-line."

* commit 'b9d279d8f9c29a3044d13482846efb21f27b5df4':
Support marking packages as hidden via command-line.
b9d279d8f9c29a3044d13482846efb21f27b5df4 06-Jun-2014 Alex Klyubin <klyubin@google.com> Merge "Support marking packages as hidden via command-line."
725c7378bf129464c118c636dbaef92ef2df993e 04-Jun-2014 Alex Klyubin <klyubin@google.com> Support marking packages as hidden via command-line.

This adds support for marking specific packages as hidden via
command-line switch hidePackage. This is useful when the package in
question cannot be marked with @hide, for example, because the
package name in .class file is different from package name in source
file, or because the package may need to be visible in another body
of documentation.

Bug: 15073623
Change-Id: Iffcf5f3d50cc8db25a3bbfb244ce74c287e3875f
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PackageInfo.java
32f2de2c795891219f436d3128b37bee70656c7f 04-Jun-2014 Robert Ly <robertly@google.com> changes to support microsites

Change-Id: I940969333028b8192f5b477675cb38dccba54dd6
rc/com/google/doclava/DocFile.java
3acc9d1825a2ed73954d10e0a11f2a0de9dd76e5 22-May-2014 Tim Murray <timmurray@google.com> Revert "Warn when showAnnotation is on unhidden element."

This reverts commit e1b2ef4ed6d4ff2aa1506ce8ca2f6a35266c3039.

Change-Id: I64539af1032f919f588fcb5dad853950a2ce1c2e
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Errors.java
rc/com/google/doclava/MemberInfo.java
e1951c7ae0c084a54990ef853a21987eea637d2a 15-Feb-2014 Dirk Dougherty <ddougherty@google.com> Add new docs build flag -briefdocs that builds the docs and
resolves jd links but doesn't output reference or browsable
samples pages.

Change-Id: I51e0c8fbcef17f773728ff0c777595a61ac31592
rc/com/google/doclava/Doclava.java
e1b2ef4ed6d4ff2aa1506ce8ca2f6a35266c3039 14-Feb-2014 Adam Metcalf <gamblore@google.com> Warn when showAnnotation is on unhidden element.

Bug: 12935050
Change-Id: I131210bd3d655b61a3b547e4342f44b33df7fb7d
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Errors.java
rc/com/google/doclava/MemberInfo.java
b91e60ed961be22bd3d88cadbdd3d0144e74e876 30-Apr-2014 Scott Main <smain@google.com> am cc6d31d2: am 3d7e7785: am d097b65e: am 4ee085a7: fix error in doclava that was causing \'toroot\' variable to show up at the beginning of federated URLs bug: 13512870

* commit 'cc6d31d22f4a1d5f2439f45a3ddc848cb02970ac':
cc6d31d22f4a1d5f2439f45a3ddc848cb02970ac 30-Apr-2014 Scott Main <smain@google.com> am 3d7e7785: am d097b65e: am 4ee085a7: fix error in doclava that was causing \'toroot\' variable to show up at the beginning of federated URLs bug: 13512870

* commit '3d7e7785cd472f97082acff52f45516f696a46fa':
c770a6e2d78cacd7ad0290d8ff43fce8f8e5f000 08-Feb-2014 Dirk Dougherty <ddougherty@google.com> DO NOT MERGE - Infer document and sample metadata when generating docs.

Conflicts:
build.gradle

Change-Id: I4bb07bf2ce9e7ea1d4616f75e48386112d7aba2e
ndroid.mk
uild.gradle
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
434521c12e31824372d1d25ea2020fb250585264 07-Apr-2014 Florian Uunk <feuunk@google.com> Don't add bounds in the type info of a var.

Showing bounds in the type info leads to generated stubs that don't
build.

The problem occurs when you have a generic class
class MyClass<V extends SomeClass> {
List<? super V> items;
}

doclava currently generates:
class MyClass<V extends SomeClass> {
List<? super V extends SomeClass> items;
}

Which doesn't build. With this change, it doesn't put "V extends
SomeClass" in the type info for items, but just "V" instead.

Change-Id: Iaa9b1bdeec96951868ba77a4eb55c566f19179ca
rc/com/google/doclava/TypeInfo.java
a2fb28f614611e164e014a5c25fd6ffbcb5e5950 08-Apr-2014 Ying Wang <wangying@google.com> Merge "Add inherited fields from hidden base to the stub classes"
bce59d203e50e0d05297d5a9015de30fd43a748b 08-Apr-2014 Dirk Dougherty <ddougherty@google.com> Revert "Infer document and sample metadata when generating docs."

This reverts commit c217a3fc2cf95e62e6bff83dba1567d6c0e11e59.

Change-Id: Ia28edddaa5358b430b42b448cbac3fece00558f8
ndroid.mk
uild.gradle
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
c217a3fc2cf95e62e6bff83dba1567d6c0e11e59 08-Feb-2014 Dirk Dougherty <ddougherty@google.com> Infer document and sample metadata when generating docs.

Change-Id: Ia9d776fa80daa227dc3f310f061d52a8cd186af6

Conflicts:
build.gradle
ndroid.mk
uild.gradle
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
3e17b6db5514a253ed459e5eb78e6738048f2655 07-Apr-2014 Dirk Dougherty <ddougherty@google.com> am b0d318f7: (-s ours) am 8bfc32ba: DO NOT MERGE - Infer document and sample metadata when generating docs.

* commit 'b0d318f71a6357550f00d1c429fa3ede03005df2':
DO NOT MERGE - Infer document and sample metadata when generating docs.
b0d318f71a6357550f00d1c429fa3ede03005df2 07-Apr-2014 Dirk Dougherty <ddougherty@google.com> am 8bfc32ba: DO NOT MERGE - Infer document and sample metadata when generating docs.

* commit '8bfc32ba1c79cdc576101944346f66112b1a3776':
DO NOT MERGE - Infer document and sample metadata when generating docs.
8bfc32ba1c79cdc576101944346f66112b1a3776 08-Feb-2014 Dirk Dougherty <ddougherty@google.com> DO NOT MERGE - Infer document and sample metadata when generating docs.

Change-Id: Ia9d776fa80daa227dc3f310f061d52a8cd186af6
ndroid.mk
uild.gradle
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
ae8cb832ba8239534b7529292065936bdb85b1e3 04-Apr-2014 Ying Wang <wangying@google.com> Add inherited fields from hidden base to the stub classes

Previously if a class implements a hidden interface,
the public fields of the interface appear in the generated docs
(see ClassInfo.makeHDF()), but not in the generated stubs
(thereby not in the SDK's android.jar and the api.txt).
This change fixed the discrepancy.

Bug: 13721174
Change-Id: I2f4d29cec935b81c13414298a4e8f9671d6c8c3f
rc/com/google/doclava/Stubs.java
3d6ccbad8bf73346225694b324ebdb199a3d2b70 27-Mar-2014 Adam Metcalf <gamblore@google.com> Merge "Keep all methods that are visible."
37abe68eddab604d66d9d7c6eaeed5b0e2b2fc33 26-Mar-2014 Adam Metcalf <gamblore@google.com> Keep all methods that are visible.

allSelfMethods() returns a list of things that meet
the protected visibility level but not including hidden
members.

Classes also call checkLevel() before being added to nonStrippable.

Bug: 13656864
Change-Id: I8ba24c7d8e476cfdd6c68e30f0fe78fdab1a6fe5
rc/com/google/doclava/Stubs.java
fae5f49d5698a9f23a596fa5c17e351335f7eb08 27-Mar-2014 Scott Main <smain@google.com> am 751b401d: am c4e22275: am 16010db2: add \'wear\' hdf variable for Android Wear doc build

* commit '751b401dea50d968aabeee77e798a6dda3740579':
add 'wear' hdf variable for Android Wear doc build
751b401dea50d968aabeee77e798a6dda3740579 27-Mar-2014 Scott Main <smain@google.com> am c4e22275: am 16010db2: add \'wear\' hdf variable for Android Wear doc build

* commit 'c4e22275f0d6c33f26e1d1c61a0be929f6eb3f26':
add 'wear' hdf variable for Android Wear doc build
c4e22275f0d6c33f26e1d1c61a0be929f6eb3f26 27-Mar-2014 Scott Main <smain@google.com> am 16010db2: add \'wear\' hdf variable for Android Wear doc build

* commit '16010db22b89093d45ff9bf19e184a54ae374e39':
add 'wear' hdf variable for Android Wear doc build
16010db22b89093d45ff9bf19e184a54ae374e39 27-Mar-2014 Scott Main <smain@google.com> add 'wear' hdf variable for Android Wear doc build

Change-Id: I15aae7ec50e0b592de1f0068879963f8b070b9c8
rc/com/google/doclava/DocFile.java
f6e143262a072c6aa75f651ebf3fdba9066d2d78 24-Mar-2014 Scott Main <smain@google.com> am cc2fcff0: am d097b65e: am 4ee085a7: fix error in doclava that was causing \'toroot\' variable to show up at the beginning of federated URLs bug: 13512870

* commit 'cc2fcff04cafc7c402aaa8522be42eb7cf146187':
fix error in doclava that was causing 'toroot' variable to show up at the beginning of federated URLs bug: 13512870
cc2fcff04cafc7c402aaa8522be42eb7cf146187 22-Mar-2014 Scott Main <smain@google.com> am d097b65e: am 4ee085a7: fix error in doclava that was causing \'toroot\' variable to show up at the beginning of federated URLs bug: 13512870

* commit 'd097b65e19d8cf79af396cb9a2d0c7cefc372577':
fix error in doclava that was causing 'toroot' variable to show up at the beginning of federated URLs bug: 13512870
3d7e7785cd472f97082acff52f45516f696a46fa 22-Mar-2014 Scott Main <smain@google.com> am d097b65e: am 4ee085a7: fix error in doclava that was causing \'toroot\' variable to show up at the beginning of federated URLs bug: 13512870

* commit 'd097b65e19d8cf79af396cb9a2d0c7cefc372577':
fix error in doclava that was causing 'toroot' variable to show up at the beginning of federated URLs bug: 13512870
d097b65e19d8cf79af396cb9a2d0c7cefc372577 22-Mar-2014 Scott Main <smain@google.com> am 4ee085a7: fix error in doclava that was causing \'toroot\' variable to show up at the beginning of federated URLs bug: 13512870

* commit '4ee085a7af0e53f0f892de292702ed90f84957da':
fix error in doclava that was causing 'toroot' variable to show up at the beginning of federated URLs bug: 13512870
4ee085a7af0e53f0f892de292702ed90f84957da 20-Mar-2014 Scott Main <smain@google.com> fix error in doclava that was causing 'toroot' variable
to show up at the beginning of federated URLs
bug: 13512870

Change-Id: I2486dd2248bd8a2d9931d77af9be860e99968234
es/assets/templates/macros.cs
rc/com/google/doclava/SeeTagInfo.java
ebe83f66d8698da7420ba64ed57441ca16a97734 17-Mar-2014 Justin Morey <jmorey@google.com> Give gradle projects more human-friendly names

This simplifies tapas support, and should make working
with GmsCore in Android Studio easier

Change-Id: Ib01b9fc22889449dd51d3ada1ab37a723f7ae93a
uild.gradle
7d280fe4ee3ce2fe8c3ab2740fc67768e19871b4 13-Mar-2014 Hui Shu <hush@google.com> Merge "Add support for @removed tag."
5118ffe3bf77ec4efa070f36a7a62fd5d1bf16bf 18-Feb-2014 Hui Shu <hush@google.com> Add support for @removed tag.

@removed tags can be applied to packages, classes, methods, fields
that were once public API, but later removed. Things annotated by
@removed cannot be used by outside developers. But applications compiled
against the old API where the @removed API were still public should
continue to work and we must not delete the @removed APIs from the
source. This fix makes sure of that.

BUG: b/11293324

Change-Id: Iab3a8bdcaa0cb0742501c33e29b8121bc169bf1b
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Comment.java
rc/com/google/doclava/Converter.java
rc/com/google/doclava/DocInfo.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/Hierarchy.java
rc/com/google/doclava/MemberInfo.java
rc/com/google/doclava/NavTree.java
rc/com/google/doclava/PackageInfo.java
rc/com/google/doclava/Scoped.java
rc/com/google/doclava/SinceTagger.java
rc/com/google/doclava/Stubs.java
rc/com/google/doclava/TodoFile.java
rc/com/google/doclava/apicheck/ApiCheck.java
7a7d95e5601a7c8ab80784455b77f5883c32c7ce 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am 4a9e5b42: am 16f26d8a: am 339d042e: am e9ab1b94: Revert "Infer document and sample metadata when generating docs."

* commit '4a9e5b425e456ebcb0a7002ed732460c0dece9db':
Revert "Infer document and sample metadata when generating docs."
1786934cbea80760ebf7ede31a68e71a5c26bb51 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> Revert "Infer document and sample metadata when generating docs."

This reverts commit 3cdd961719e41b26b129abbeefa644f09a8e449c.

Change-Id: I991368d53b29cbd308de5ffcfe4f7899b277ca64
(cherry picked from commit e9ab1b94fc0414fe72646b90b355562abf98d86e)
ndroid.mk
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
4a9e5b425e456ebcb0a7002ed732460c0dece9db 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am 16f26d8a: am 339d042e: am e9ab1b94: Revert "Infer document and sample metadata when generating docs."

* commit '16f26d8a40641f99b1f5e6b997c172d0e8c1d294':
Revert "Infer document and sample metadata when generating docs."
16f26d8a40641f99b1f5e6b997c172d0e8c1d294 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am 339d042e: am e9ab1b94: Revert "Infer document and sample metadata when generating docs."

* commit '339d042e37dbed7c4eb259889b705ffb533f5da3':
Revert "Infer document and sample metadata when generating docs."
339d042e37dbed7c4eb259889b705ffb533f5da3 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am e9ab1b94: Revert "Infer document and sample metadata when generating docs."

* commit 'e9ab1b94fc0414fe72646b90b355562abf98d86e':
Revert "Infer document and sample metadata when generating docs."
e9ab1b94fc0414fe72646b90b355562abf98d86e 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> Revert "Infer document and sample metadata when generating docs."

This reverts commit 3cdd961719e41b26b129abbeefa644f09a8e449c.

Change-Id: I991368d53b29cbd308de5ffcfe4f7899b277ca64
ndroid.mk
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
faa599c08d541ef17fc3746119f95452d2bcbe94 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am c3e68c8e: am 5ebd0fff: am f1ad4c7b: am 3cdd9617: Infer document and sample metadata when generating docs.

* commit 'c3e68c8e232b8fa682fe593801cd76dbc2e8a8f0':
Infer document and sample metadata when generating docs.
c3e68c8e232b8fa682fe593801cd76dbc2e8a8f0 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am 5ebd0fff: am f1ad4c7b: am 3cdd9617: Infer document and sample metadata when generating docs.

* commit '5ebd0fff6e39a0c4421abb48f306c02b234135ff':
Infer document and sample metadata when generating docs.
5ebd0fff6e39a0c4421abb48f306c02b234135ff 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am f1ad4c7b: am 3cdd9617: Infer document and sample metadata when generating docs.

* commit 'f1ad4c7b6605f7211a78815d19011bf135f0075a':
Infer document and sample metadata when generating docs.
f1ad4c7b6605f7211a78815d19011bf135f0075a 22-Feb-2014 Dirk Dougherty <ddougherty@google.com> am 3cdd9617: Infer document and sample metadata when generating docs.

* commit '3cdd961719e41b26b129abbeefa644f09a8e449c':
Infer document and sample metadata when generating docs.
3cdd961719e41b26b129abbeefa644f09a8e449c 08-Feb-2014 Dirk Dougherty <ddougherty@google.com> Infer document and sample metadata when generating docs.

Change-Id: I523314eaf72097373577c77fbd950e0f9bbc6577
ndroid.mk
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
edf1f7360309748f4192034561c85f80cf46440d 23-Jan-2014 Dirk Dougherty <ddougherty@google.com> am 4dc187a0: am 2c539239: am a078a044: am 8a8f7912: Doclava: Add support for building samples toc from contents of a target browsable dir.

* commit '4dc187a049ed5b1c83c1d8f68581a415a9a8130a':
Doclava: Add support for building samples toc from contents of a target browsable dir.
4dc187a049ed5b1c83c1d8f68581a415a9a8130a 23-Jan-2014 Dirk Dougherty <ddougherty@google.com> am 2c539239: am a078a044: am 8a8f7912: Doclava: Add support for building samples toc from contents of a target browsable dir.

* commit '2c539239e9ee853dda13741bccedc5cbfb7220b1':
Doclava: Add support for building samples toc from contents of a target browsable dir.
2c539239e9ee853dda13741bccedc5cbfb7220b1 23-Jan-2014 Dirk Dougherty <ddougherty@google.com> am a078a044: am 8a8f7912: Doclava: Add support for building samples toc from contents of a target browsable dir.

* commit 'a078a044cb82065cea7c99048d892e4c9a1a0441':
Doclava: Add support for building samples toc from contents of a target browsable dir.
a078a044cb82065cea7c99048d892e4c9a1a0441 23-Jan-2014 Dirk Dougherty <ddougherty@google.com> am 8a8f7912: Doclava: Add support for building samples toc from contents of a target browsable dir.

* commit '8a8f7912692bcf9f984a7a24eaf47da69b6d2992':
Doclava: Add support for building samples toc from contents of a target browsable dir.
8a8f7912692bcf9f984a7a24eaf47da69b6d2992 27-Nov-2013 Dirk Dougherty <ddougherty@google.com> Doclava: Add support for building samples toc from contents of a target browsable dir.

(cherry picked from commit 7537229470687560714401104558abdf82f81441)

Change-Id: I26cbdde207040d1b5db5ccb1793d396567fd4163
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
9002a4c471ffe36153165a7482f5d0249f42a001 10-Dec-2013 Qiwen Zhao <zhao@google.com> am a2ef86a8: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit 'a2ef86a8357bfab0a437fcef0ebdf7cdf863dc3a':
a2ef86a8357bfab0a437fcef0ebdf7cdf863dc3a 09-Dec-2013 Qiwen Zhao <zhao@google.com> DO NOT MERGE reset to goog/klp-volantis-dev
4734e254f270b399f0669a28668c7b4eadf4c722 09-Dec-2013 Dirk Dougherty <ddougherty@google.com> am b0f17cb2: am 3d00642e: am 20afdc19: In jd_lists_unified, output null type indices as \'\'.

* commit 'b0f17cb2cccf85ff94de2b5bdd5f26300e1e902b':
In jd_lists_unified, output null type indices as ''.
b0f17cb2cccf85ff94de2b5bdd5f26300e1e902b 09-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 3d00642e: am 20afdc19: In jd_lists_unified, output null type indices as \'\'.

* commit '3d00642ef2f4ca0ffc72c7e7ecfad46d0a081eca':
In jd_lists_unified, output null type indices as ''.
3d00642ef2f4ca0ffc72c7e7ecfad46d0a081eca 09-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 20afdc19: In jd_lists_unified, output null type indices as \'\'.

* commit '20afdc19f0ed72a2b0c171a61f790de5db85c4af':
In jd_lists_unified, output null type indices as ''.
20afdc19f0ed72a2b0c171a61f790de5db85c4af 09-Dec-2013 Dirk Dougherty <ddougherty@google.com> In jd_lists_unified, output null type indices as ''.

Change-Id: I43306b9cc82a739e4af6664e4e0bbabb7c564437
rc/com/google/doclava/PageMetadata.java
8685030ef840d83987c9d795ba68321f508fa634 06-Dec-2013 Qiwen Zhao <zhao@google.com> am 744cabf2: (-s ours) snap to klp-dev-plus-aosp 80b34f4 with history

* commit '744cabf205c8bdd6424ad2fcde6554bced3170ce':
e4736da113ee2af89b831b4bae0ef645b686ebc1 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 55a2dc27: (-s ours) am debce5a3: (-s ours) am a786ee0c: am f9d9cb04: Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit '55a2dc27c17be3abbea58f78acb7801af8c75ab6':
d492c990ae5bbbefc368832f48d1fabb058eea6a 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 3517f182: am 4732d6dc: am 585fb5f4: am 3aef81be: Merge "Add jd_lists_unified.cs to default doclava templates." into klp-docs

* commit '3517f182c5489e31a268ed2eb546e197e41d0015':
28f24e379d4f75f40f32911789be93b8a5d3a0aa 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 798502c9: (-s ours) am 0a1cd828: (-s ours) am fcaec488: am ad26f2a0: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."

* commit '798502c9c7f3550d265d65ce85f0318e6c5597e7':
48ca001db9cec5b835d48e43f880b239f30c7585 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am c08e0016: (-s ours) am e19f40b6: (-s ours) am 669db75a: am 2a9088f8: Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit 'c08e00168adedec614fa125fbac036b980be211d':
4c8dcea27c3e7d68d01dfda5c3676fb4dacd5fbf 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 1e362e47: am 01b0b7bd: am af220bfa: am ffda92f6: Merge "Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."" into klp-docs

* commit '1e362e47a953e5c7708f2b13fbdd4d2df354c95c':
598b451b5a3918579e769ccacb3221192448843f 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 83303dbc: am 87642819: am 75efb188: am 3542770e: Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.

* commit '83303dbce78de94f4816c72f7e2450d6bb07c759':
9b07a3af5580ba78f1f385a42c3f181792e23349 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am e9414675: am 94de003e: am 61c0eab9: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."

* commit 'e9414675aca1283486b04fc4d23dfe61eeee922c':
a36547f46159ed3457eeb088b9abbe77edae326f 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am a248f8f1: am 58a764c0: am c433a06b: am 582c1d6e: Generate jd_lists in new json format, with metadata extracted from all docs/samples.

* commit 'a248f8f12359cece36c41b5815ec370a79b3bc16':
5e40036da429417020ccf4bcda1567afb72780f9 06-Dec-2013 Scott Main <smain@google.com> am aa5132f2: am 5a0cc23d: am fb67748b: am 600c94d9: change link for each category in sample side nav

* commit 'aa5132f2e0c1c17d73096f229573ad7c271ae893':
8ce2fa7c1aa9eee94441eb571821ef81a0597552 06-Dec-2013 Scott Main <smain@google.com> am f3f13c51: am fc355edf: am d9f572f5: change link for each category in sample side nav

* commit 'f3f13c51723be5eecbd1cbcfee9178c8db3c51ed':
8ddb0053f9b04e9865bfac57679a84de057d21f0 06-Dec-2013 Narayan Kamath <narayan@google.com> am 27da065b: am 775e8d9f: am f607faf9: Merge "Work around a couple of doclet API bugs."

* commit '27da065b7c5cea6e2afad4bcdf1a542488d1aa8d':
744cabf205c8bdd6424ad2fcde6554bced3170ce 06-Dec-2013 Qiwen Zhao <zhao@google.com> snap to klp-dev-plus-aosp 80b34f4 with history
55a2dc27c17be3abbea58f78acb7801af8c75ab6 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am debce5a3: (-s ours) am a786ee0c: am f9d9cb04: Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit 'debce5a3366bd7e3d84f1d4b00556e4e5ce5a51b':
Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.
3517f182c5489e31a268ed2eb546e197e41d0015 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 4732d6dc: am 585fb5f4: am 3aef81be: Merge "Add jd_lists_unified.cs to default doclava templates." into klp-docs

* commit '4732d6dc76a45934ebbcb8c7cc37a1bd651f722e':
Add jd_lists_unified.cs to default doclava templates.
798502c9c7f3550d265d65ce85f0318e6c5597e7 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 0a1cd828: (-s ours) am fcaec488: am ad26f2a0: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."

* commit '0a1cd828ef4c2da45737bbb9b80ab08605810a33':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."
c08e00168adedec614fa125fbac036b980be211d 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am e19f40b6: (-s ours) am 669db75a: am 2a9088f8: Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit 'e19f40b645ab0363697850ad3270acc53777677b':
Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.
1e362e47a953e5c7708f2b13fbdd4d2df354c95c 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 01b0b7bd: am af220bfa: am ffda92f6: Merge "Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."" into klp-docs

* commit '01b0b7bddb02c6d26927178db5dd19a5eed7b970':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."
83303dbce78de94f4816c72f7e2450d6bb07c759 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 87642819: am 75efb188: am 3542770e: Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.

* commit '876428195b59f25ede24e1590b4b84e7f6178327':
Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.
e9414675aca1283486b04fc4d23dfe61eeee922c 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 94de003e: am 61c0eab9: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."

* commit '94de003ec4877b249e39530f5aa0fd688918ab80':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."
a248f8f12359cece36c41b5815ec370a79b3bc16 06-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 58a764c0: am c433a06b: am 582c1d6e: Generate jd_lists in new json format, with metadata extracted from all docs/samples.

* commit '58a764c00cce5c3924574c61793b7fd9e0d28e73':
Generate jd_lists in new json format, with metadata extracted from all docs/samples.
aa5132f2e0c1c17d73096f229573ad7c271ae893 06-Dec-2013 Scott Main <smain@google.com> am 5a0cc23d: am fb67748b: am 600c94d9: change link for each category in sample side nav

* commit '5a0cc23dbc8c646dd1e26ea0b03783fb4809fe3f':
change link for each category in sample side nav
f3f13c51723be5eecbd1cbcfee9178c8db3c51ed 06-Dec-2013 Scott Main <smain@google.com> am fc355edf: am d9f572f5: change link for each category in sample side nav

* commit 'fc355edf04d947a798fd95e48c5dbd5d3e40294a':
27da065b7c5cea6e2afad4bcdf1a542488d1aa8d 06-Dec-2013 Narayan Kamath <narayan@google.com> am 775e8d9f: am f607faf9: Merge "Work around a couple of doclet API bugs."

* commit '775e8d9fbbf4e0c5d9393b18b3f8771e85b0cc14':
Work around a couple of doclet API bugs.
88cfa08367b38c606ba8126eb64bb2127cb112b1 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am 80b34f4d: am 5e481438: Merge commit \'fc355edf04d947a798fd95e48c5dbd5d3e40294a\' into HEAD

* commit '80b34f4d82793cfb9e9125729fa5de127aedf8fe':
80b34f4d82793cfb9e9125729fa5de127aedf8fe 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am 5e481438: Merge commit \'fc355edf04d947a798fd95e48c5dbd5d3e40294a\' into HEAD

* commit '5e48143876c73bfa9f84e7996005103d6a615e1f':
5e48143876c73bfa9f84e7996005103d6a615e1f 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'fc355edf04d947a798fd95e48c5dbd5d3e40294a' into HEAD
bc44258efb4ff44827719e5e3f616945a959a20b 04-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 6200a289: am c706c1ff: Merge "Doclava: Add support for building samples toc from contents of a target browsable dir." into klp-ub-dev

* commit '6200a28957843f1c003ade7c03380092ffab74a9':
Doclava: Add support for building samples toc from contents of a target browsable dir.
6200a28957843f1c003ade7c03380092ffab74a9 04-Dec-2013 Dirk Dougherty <ddougherty@google.com> am c706c1ff: Merge "Doclava: Add support for building samples toc from contents of a target browsable dir." into klp-ub-dev

* commit 'c706c1ff8975bfd16209fcc8b3114ce0ce235861':
Doclava: Add support for building samples toc from contents of a target browsable dir.
c706c1ff8975bfd16209fcc8b3114ce0ce235861 04-Dec-2013 Dirk Dougherty <ddougherty@google.com> Merge "Doclava: Add support for building samples toc from contents of a target browsable dir." into klp-ub-dev
7537229470687560714401104558abdf82f81441 27-Nov-2013 Dirk Dougherty <ddougherty@google.com> Doclava: Add support for building samples toc from contents of a target browsable dir.

Change-Id: I420fd96a6dfbb3eac07e8ab9c1d25f5895a3d0ca
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
6b980d7341128ae41733aa9a0496301afb6d30f9 03-Dec-2013 Dirk Dougherty <ddougherty@google.com> am ae19f356: am 44578a8e: Revert "Add support for building samples toc from contents of a target browsable dir."

* commit 'ae19f356c4a139358c7c3ee77938b0e070f54de6':
Revert "Add support for building samples toc from contents of a target browsable dir."
ae19f356c4a139358c7c3ee77938b0e070f54de6 03-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 44578a8e: Revert "Add support for building samples toc from contents of a target browsable dir."

* commit '44578a8e35cd48f4dcb8c3d0f9791522287b3e32':
Revert "Add support for building samples toc from contents of a target browsable dir."
44578a8e35cd48f4dcb8c3d0f9791522287b3e32 03-Dec-2013 Dirk Dougherty <ddougherty@google.com> Revert "Add support for building samples toc from contents of a target browsable dir."

This reverts commit 509ff6b16f0143a200e9a5314585d22f31a51991.

Change-Id: I878a27c0f6c2970279d9b1a1a20dd845a29b7eec
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
cf9dc8aa655262f9962f1ad490762a243330b623 03-Dec-2013 Dirk Dougherty <ddougherty@google.com> am abf687df: am 509ff6b1: Add support for building samples toc from contents of a target browsable dir.

* commit 'abf687dfd21a8e376d71198713e7a4f81a43020f':
Add support for building samples toc from contents of a target browsable dir.
abf687dfd21a8e376d71198713e7a4f81a43020f 03-Dec-2013 Dirk Dougherty <ddougherty@google.com> am 509ff6b1: Add support for building samples toc from contents of a target browsable dir.

* commit '509ff6b16f0143a200e9a5314585d22f31a51991':
Add support for building samples toc from contents of a target browsable dir.
509ff6b16f0143a200e9a5314585d22f31a51991 27-Nov-2013 Dirk Dougherty <ddougherty@google.com> Add support for building samples toc from contents of a target browsable dir.

Change-Id: I60862903fb7f023f5cef953c517b5b3135347712
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
a563b0e1d2b980d92c3542770c7c9b773cbc944f 23-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 6e71793a: am 1dc18bc8: am 187b985f: When processing samplecode nodes, ignore empty nodes.

* commit '6e71793a90207eddf912d4cf8573dfd186433e50':
When processing samplecode nodes, ignore empty nodes.
6e71793a90207eddf912d4cf8573dfd186433e50 23-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 1dc18bc8: am 187b985f: When processing samplecode nodes, ignore empty nodes.

* commit '1dc18bc8b2797b05a8e83d29e3568e423fc56c3b':
When processing samplecode nodes, ignore empty nodes.
1dc18bc8b2797b05a8e83d29e3568e423fc56c3b 23-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 187b985f: When processing samplecode nodes, ignore empty nodes.

* commit '187b985f817b4a0181c5127270a2aab9915cf60a':
When processing samplecode nodes, ignore empty nodes.
187b985f817b4a0181c5127270a2aab9915cf60a 23-Nov-2013 Dirk Dougherty <ddougherty@google.com> When processing samplecode nodes, ignore empty nodes.

Change-Id: I6265a721e53339fb2104776d5a8ee240dab40ceb
rc/com/google/doclava/SampleCode.java
d385b34c76a2e03fbc747642073f70e96e3df6e3 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am fe6ab5c1: am a1a97039: Merge commit \'a6ec6136304ef314e1f994c0edd1bfaeef6dbb44\' into HEAD

* commit 'fe6ab5c1f92d6f76eb4a9b545b1d5d4e5bebcd4d':
fe6ab5c1f92d6f76eb4a9b545b1d5d4e5bebcd4d 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am a1a97039: Merge commit \'a6ec6136304ef314e1f994c0edd1bfaeef6dbb44\' into HEAD

* commit 'a1a970397c497bb302cad37e98017f335308743d':
a1a970397c497bb302cad37e98017f335308743d 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'a6ec6136304ef314e1f994c0edd1bfaeef6dbb44' into HEAD
997c66eba2913684f62a4e2932e9593fc90b379c 22-Nov-2013 Dirk Dougherty <ddougherty@google.com> am a0b5982b: am 2ff79837: am 5ce827a4: Initiate samples browser processing from a single root directory, rather than from a list of project paths defined in Android.mk.

* commit 'a0b5982b943058420528baa3afae5b8da057b124':
Initiate samples browser processing from a single root directory, rather than from a list of project paths defined in Android.mk.
a0b5982b943058420528baa3afae5b8da057b124 22-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 2ff79837: am 5ce827a4: Initiate samples browser processing from a single root directory, rather than from a list of project paths defined in Android.mk.

* commit '2ff798377c1fc5ca3ecf1b635e48b0eb7a337c36':
Initiate samples browser processing from a single root directory, rather than from a list of project paths defined in Android.mk.
2ff798377c1fc5ca3ecf1b635e48b0eb7a337c36 22-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 5ce827a4: Initiate samples browser processing from a single root directory, rather than from a list of project paths defined in Android.mk.

* commit '5ce827a43e16b415ad8554c97cee01bf549067d6':
Initiate samples browser processing from a single root directory, rather than from a list of project paths defined in Android.mk.
5ce827a43e16b415ad8554c97cee01bf549067d6 22-Nov-2013 Dirk Dougherty <ddougherty@google.com> Initiate samples browser processing from a single root directory, rather than from a list of project paths defined in Android.mk.

Change-Id: I680cfeb5d2690d64064859f40cec6014e392bfe5
rc/com/google/doclava/Doclava.java
42303ccef18dc4492dc668a020197bc6b1956cbc 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> Add support for jd_lists_unified, with metadata extracted from all docs/samples.

Change-Id: I4f6da0a26473cd7fca0bda5c0139e92c0ae20335
(cherry picked from commit f9d9cb045339e902b36391d19be3c665b1585ab8)
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
e185e1d013deae74e612908cb080cc4473ddb25d 21-Nov-2013 Dirk Dougherty <ddougherty@google.com> am debce5a3: (-s ours) am a786ee0c: am f9d9cb04: Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit 'debce5a3366bd7e3d84f1d4b00556e4e5ce5a51b':
Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.
debce5a3366bd7e3d84f1d4b00556e4e5ce5a51b 21-Nov-2013 Dirk Dougherty <ddougherty@google.com> am a786ee0c: am f9d9cb04: Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit 'a786ee0c292087eb46afba3d633636839cd8c343':
Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.
a786ee0c292087eb46afba3d633636839cd8c343 21-Nov-2013 Dirk Dougherty <ddougherty@google.com> am f9d9cb04: Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit 'f9d9cb045339e902b36391d19be3c665b1585ab8':
Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.
f9d9cb045339e902b36391d19be3c665b1585ab8 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> Add support for jd_lists_unified, with metadata extracted from all docs/samples. DO NOT MERGE.

Change-Id: I4f6da0a26473cd7fca0bda5c0139e92c0ae20335
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
7f934a35e0d17bd7e496ca203667a4962bc6e791 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 4732d6dc: am 585fb5f4: am 3aef81be: Merge "Add jd_lists_unified.cs to default doclava templates." into klp-docs

* commit '4732d6dc76a45934ebbcb8c7cc37a1bd651f722e':
Add jd_lists_unified.cs to default doclava templates.
4732d6dc76a45934ebbcb8c7cc37a1bd651f722e 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 585fb5f4: am 3aef81be: Merge "Add jd_lists_unified.cs to default doclava templates." into klp-docs

* commit '585fb5f410caad6911858996bbe1260376773411':
Add jd_lists_unified.cs to default doclava templates.
585fb5f410caad6911858996bbe1260376773411 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 3aef81be: Merge "Add jd_lists_unified.cs to default doclava templates." into klp-docs

* commit '3aef81be75d06c073f73fa0e3943a3148fe2cb10':
Add jd_lists_unified.cs to default doclava templates.
3aef81be75d06c073f73fa0e3943a3148fe2cb10 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> Merge "Add jd_lists_unified.cs to default doclava templates." into klp-docs
7fa522c20fe4863d687f407aede82e1a72253a5d 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> Add jd_lists_unified.cs to default doclava templates.

Change-Id: Id5d6bc84f7c8bccbcb1d053db0b07850400a9dbc
es/assets/templates/jd_lists_unified.cs
be1499e5ec09ecfdbfa9720e44900e05e0a69aea 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 0a1cd828: (-s ours) am fcaec488: am ad26f2a0: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."

* commit '0a1cd828ef4c2da45737bbb9b80ab08605810a33':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."
0a1cd828ef4c2da45737bbb9b80ab08605810a33 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am fcaec488: am ad26f2a0: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."

* commit 'fcaec488544853b0cfe546e0e26dc5845c211488':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."
fcaec488544853b0cfe546e0e26dc5845c211488 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am ad26f2a0: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."

* commit 'ad26f2a07d8519463f3be94a18a01c82758f6714':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."
ad26f2a07d8519463f3be94a18a01c82758f6714 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE."

This reverts commit 2a9088f83fa9b12100b231944d3a9ad371e42c28.

Change-Id: I02730b2cb6bc0b10db694e742a787c00048ecb7f
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
df8302e8b1f98dd049e88332fc477fd2dc1489a0 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am e19f40b6: (-s ours) am 669db75a: am 2a9088f8: Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit 'e19f40b645ab0363697850ad3270acc53777677b':
Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.
e19f40b645ab0363697850ad3270acc53777677b 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 669db75a: am 2a9088f8: Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit '669db75aec2e004e76c4c14dee999eb19947bb56':
Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.
669db75aec2e004e76c4c14dee999eb19947bb56 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 2a9088f8: Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.

* commit '2a9088f83fa9b12100b231944d3a9ad371e42c28':
Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.
2a9088f83fa9b12100b231944d3a9ad371e42c28 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> Generate jd_lists in new json format, with metadata extracted from all docs/samples. DO NOT MERGE.

Change-Id: I66ddff34cad7831a32ac2eae99d39e66fecf51c6
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
11394e945c309601ff5962e5ec45841d17d31fca 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 01b0b7bd: am af220bfa: am ffda92f6: Merge "Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."" into klp-docs

* commit '01b0b7bddb02c6d26927178db5dd19a5eed7b970':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."
0f1e75206a38502a823dbf2f837b077f3ff0aad1 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 87642819: am 75efb188: am 3542770e: Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.

* commit '876428195b59f25ede24e1590b4b84e7f6178327':
Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.
2a55635fa508b42004c16b261f5a8dd2e06f41c8 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 94de003e: am 61c0eab9: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."

* commit '94de003ec4877b249e39530f5aa0fd688918ab80':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."
01b0b7bddb02c6d26927178db5dd19a5eed7b970 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am af220bfa: am ffda92f6: Merge "Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."" into klp-docs

* commit 'af220bfa834f423e4af759238b75e26d3ae36a64':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."
876428195b59f25ede24e1590b4b84e7f6178327 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 75efb188: am 3542770e: Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.

* commit '75efb188739c6fb67dc1a0765eec04712095d3af':
Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.
94de003ec4877b249e39530f5aa0fd688918ab80 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 61c0eab9: Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."

* commit '61c0eab9dc7699fede86a3da1b1a5509189b9020':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."
af220bfa834f423e4af759238b75e26d3ae36a64 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am ffda92f6: Merge "Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."" into klp-docs

* commit 'ffda92f621c97825abab0501dc2041d9b108f374':
Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."
75efb188739c6fb67dc1a0765eec04712095d3af 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 3542770e: Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.

* commit '3542770e7b9e121d1a3107300af1aac1b2555128':
Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.
61c0eab9dc7699fede86a3da1b1a5509189b9020 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."

This reverts commit 582c1d6e605c968147f3e2058ec31b47c09e19e3.

Change-Id: I11765e142d2fb41361b924a771b5531d79886399
(cherry picked from commit fc51462944652e08171e809b8e6419d218413564)
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
ffda92f621c97825abab0501dc2041d9b108f374 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> Merge "Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."" into klp-docs
fc51462944652e08171e809b8e6419d218413564 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> Revert "Generate jd_lists in new json format, with metadata extracted from all docs/samples."

This reverts commit 582c1d6e605c968147f3e2058ec31b47c09e19e3.

Change-Id: I11765e142d2fb41361b924a771b5531d79886399
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
3542770e7b9e121d1a3107300af1aac1b2555128 19-Nov-2013 Dirk Dougherty <ddougherty@google.com> Doc change: Show links for download and project on project landing pages. Filter images/videos to exclude large files. Remove sorting elevation of "src" dir in nav.

Change-Id: Ieb92adfba204a68313376095e9a10491c474e162
rc/com/google/doclava/SampleCode.java
4d4cb0759bf5fd9accb6745159640a0908131bc9 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 58a764c0: am c433a06b: am 582c1d6e: Generate jd_lists in new json format, with metadata extracted from all docs/samples.

* commit '58a764c00cce5c3924574c61793b7fd9e0d28e73':
Generate jd_lists in new json format, with metadata extracted from all docs/samples.
bc3a34a9cb8d1fe11a24efcbbeeb3b211d810203 20-Nov-2013 Scott Main <smain@google.com> am 5a0cc23d: am fb67748b: am 600c94d9: change link for each category in sample side nav

* commit '5a0cc23dbc8c646dd1e26ea0b03783fb4809fe3f':
change link for each category in sample side nav
58a764c00cce5c3924574c61793b7fd9e0d28e73 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am c433a06b: am 582c1d6e: Generate jd_lists in new json format, with metadata extracted from all docs/samples.

* commit 'c433a06b5b771e4ca7c7e09a10077bc2dc088536':
Generate jd_lists in new json format, with metadata extracted from all docs/samples.
5a0cc23dbc8c646dd1e26ea0b03783fb4809fe3f 20-Nov-2013 Scott Main <smain@google.com> am fb67748b: am 600c94d9: change link for each category in sample side nav

* commit 'fb67748bd46ffd0ad7dc9e27bbc9fd6d1671219b':
change link for each category in sample side nav
c433a06b5b771e4ca7c7e09a10077bc2dc088536 20-Nov-2013 Dirk Dougherty <ddougherty@google.com> am 582c1d6e: Generate jd_lists in new json format, with metadata extracted from all docs/samples.

* commit '582c1d6e605c968147f3e2058ec31b47c09e19e3':
Generate jd_lists in new json format, with metadata extracted from all docs/samples.
fb67748bd46ffd0ad7dc9e27bbc9fd6d1671219b 20-Nov-2013 Scott Main <smain@google.com> am 600c94d9: change link for each category in sample side nav

* commit '600c94d951a047237fa8638780a8443260bba961':
change link for each category in sample side nav
582c1d6e605c968147f3e2058ec31b47c09e19e3 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> Generate jd_lists in new json format, with metadata extracted from all docs/samples.

Change-Id: Iecc66a8c2f6efab7058abdb7c1295c929cf0ef09
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/PageMetadata.java
rc/com/google/doclava/SampleCode.java
15ae69ccfb0f8795331bfdf639dafa8c9826a174 31-Oct-2013 Scott Main <smain@google.com> am fc355edf: am d9f572f5: change link for each category in sample side nav

* commit 'fc355edf04d947a798fd95e48c5dbd5d3e40294a':
change link for each category in sample side nav
fc355edf04d947a798fd95e48c5dbd5d3e40294a 31-Oct-2013 Scott Main <smain@google.com> am d9f572f5: change link for each category in sample side nav

* commit 'd9f572f57a02aa58839469d7e79fc2af64819ce2':
change link for each category in sample side nav
600c94d951a047237fa8638780a8443260bba961 31-Oct-2013 Scott Main <smain@google.com> change link for each category in sample side nav

Change-Id: I8e56114be1842bcca7f4373d80392090d2b51964
(cherry picked from commit d9f572f57a02aa58839469d7e79fc2af64819ce2)
rc/com/google/doclava/Doclava.java
d9f572f57a02aa58839469d7e79fc2af64819ce2 31-Oct-2013 Scott Main <smain@google.com> change link for each category in sample side nav

Change-Id: I8e56114be1842bcca7f4373d80392090d2b51964
rc/com/google/doclava/Doclava.java
2902ec8ac40c9aa9a8e7e092eef0fffeea4fdb63 28-Oct-2013 Narayan Kamath <narayan@google.com> am 775e8d9f: am f607faf9: Merge "Work around a couple of doclet API bugs."

* commit '775e8d9fbbf4e0c5d9393b18b3f8771e85b0cc14':
Work around a couple of doclet API bugs.
775e8d9fbbf4e0c5d9393b18b3f8771e85b0cc14 28-Oct-2013 Narayan Kamath <narayan@google.com> am f607faf9: Merge "Work around a couple of doclet API bugs."

* commit 'f607faf92243699f3251980e7bc9f95e9cd09c06':
Work around a couple of doclet API bugs.
f607faf92243699f3251980e7bc9f95e9cd09c06 28-Oct-2013 Narayan Kamath <narayan@google.com> Merge "Work around a couple of doclet API bugs."
b1b0ee7431822a163552601a529e4db7cb3114c8 24-Oct-2013 Narayan Kamath <narayan@google.com> Work around a couple of doclet API bugs.

- We sometimes receive spurious duplicate ClassInfo
objects from the root doc that are poorly formed (have
a "null" position). Discard them.
- Don't call ClassInfo#findClass with an empty string,
it returns a bogus ClassInfo object.

Change-Id: Ie8b857fc906402993f84df8465e1550be95a5e5d
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Converter.java
6e1d8acecdca92a6132b7703bfa079c1cd23b1e0 17-Oct-2013 Brett Chabot <brettchabot@google.com> Merge "Output annotations in package-summary docs."
700b9f275638190f24e83a91b5105255df7f7c11 05-Oct-2013 Brett Chabot <brettchabot@google.com> Output annotations in package-summary docs.

Bug 10749552
Bug 6333357

Change-Id: Iffdd04c911bafc8f2c368fc0d24af926f155928a
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/NavTree.java
rc/com/google/doclava/PackageInfo.java
7db4126adcf3f7bcb21e090e5eff10f287f84fa7 09-Oct-2013 Ed Heyl <edheyl@google.com> am a6ec6136: merge in KFS78N (no-op)

* commit 'a6ec6136304ef314e1f994c0edd1bfaeef6dbb44':
a6ec6136304ef314e1f994c0edd1bfaeef6dbb44 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KFS78N (no-op)
490fa04f830b43545a8877d1bfd8de7b32bb3182 16-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-factoryrom-release history after reset to klp-release
de5d7518c41a072a5aa6298e59948ceda2cbf4ed 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 8bdc633e: am 8c33a22b: am aba01a72: Merge "Snip empty group nodes from samples_navtree_data so they don\'t show up in TOC." into jb-mr2-docs

* commit '8bdc633e4747daed2c3d016d3baa35b76dc05ad4':
Snip empty group nodes from samples_navtree_data so they don't show up in TOC.
8bdc633e4747daed2c3d016d3baa35b76dc05ad4 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 8c33a22b: am aba01a72: Merge "Snip empty group nodes from 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.
8c33a22b7fa09f1bfcb4661caf52a16d1bd8b030 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> am aba01a72: Merge "Snip empty group nodes from samples_navtree_data so they 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.
3e62d6b62c1a459a776d91c9d70625ff43507edd 14-Sep-2013 Scott Main <smain@google.com> am 3be5aed8: am 34dd7ccd: am 9a8729a2: update url for sample topic pages

* commit '3be5aed8a823e2f5d3456f445b158ab2aa99228b':
update url for sample topic pages
aba01a728fe2d8f119c908dd9cfad42ee07c1f29 14-Sep-2013 Dirk Dougherty <ddougherty@google.com> Merge "Snip empty group nodes from samples_navtree_data so they don't show up in TOC." into jb-mr2-docs
3be5aed8a823e2f5d3456f445b158ab2aa99228b 14-Sep-2013 Scott Main <smain@google.com> am 34dd7ccd: am 9a8729a2: update url for sample topic pages

* commit '34dd7ccd9e00466d09be9c68b8191f9381d25b9a':
update url for sample topic pages
34dd7ccd9e00466d09be9c68b8191f9381d25b9a 14-Sep-2013 Scott Main <smain@google.com> am 9a8729a2: update url for sample topic pages

* commit '9a8729a253630801f20047b1e0194355b0daa69b':
update url for sample topic pages
9a8729a253630801f20047b1e0194355b0daa69b 14-Sep-2013 Scott Main <smain@google.com> update url for sample topic pages

Change-Id: Idbe0f7848fc62ea4d2386a1ccf1c813d42db8fe2
rc/com/google/doclava/Doclava.java
1d8fa8ddfef0080a63faf8ec09c69bd5f00ee601 13-Sep-2013 Dirk Dougherty <ddougherty@google.com> Snip empty group nodes from samples_navtree_data so they don't show up in TOC.

Change-Id: Ie308229eda29ce812933d7f81f4d07f3669f85af
rc/com/google/doclava/SampleCode.java
e03e40341e3474a37a49b42f6c568042bf6a294f 13-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 49c1fe0e: am 07e4bbe9: am 176ad4e0: Add key for group link param.

* commit '49c1fe0ed6e858d3da57c09e84944d3f7aeead93':
Add key for group link param.
47bc4180ad7337df970cff35ac9661ff80654bd2 13-Sep-2013 Dirk Dougherty <ddougherty@google.com> am d65ad1e4: am d723f092: am 84aeec50: Add query-formatted urls for groups in samples navtree.

* commit 'd65ad1e4b3637ca1ff512481997fe5075ced7467':
Add query-formatted urls for groups in samples navtree.
49c1fe0ed6e858d3da57c09e84944d3f7aeead93 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 07e4bbe9: am 176ad4e0: Add key for group link param.

* commit '07e4bbe9dada669ff4d492f6f4c19ee66ea3406f':
Add key for group link param.
07e4bbe9dada669ff4d492f6f4c19ee66ea3406f 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 176ad4e0: Add key for group link param.

* commit '176ad4e0c2fd47dc60a8facbe880487944f8749b':
Add key for group link param.
176ad4e0c2fd47dc60a8facbe880487944f8749b 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> Add key for group link param.

Change-Id: Ia731d3f04dfb46271dd6dcc782908601a663df58
rc/com/google/doclava/Doclava.java
d65ad1e4b3637ca1ff512481997fe5075ced7467 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> am d723f092: am 84aeec50: Add query-formatted urls for groups in samples navtree.

* commit 'd723f092f9ddb68ed50c14715f708d452e42466b':
Add query-formatted urls for groups in samples navtree.
d723f092f9ddb68ed50c14715f708d452e42466b 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 84aeec50: Add query-formatted urls for groups in samples navtree.

* commit '84aeec506d2845006dd61f2ab39e748b254e9f3b':
Add query-formatted urls for groups in samples navtree.
84aeec506d2845006dd61f2ab39e748b254e9f3b 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> Add query-formatted urls for groups in samples navtree.

Change-Id: Id84cc5081f740f78dc2d2f9838a295ffb94038b4
rc/com/google/doclava/Doclava.java
43b59d02637fc0fd96de26e7e2f9a8bdb9b84447 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 30ce050d: am 492b5fc3: am 56257f3f: Merge "Modify format of samples_navtree_data.js to sort projects group tag." into jb-mr2-docs

* commit '30ce050d00330936ebfc4125c3c12f470ef38a96':
Modify format of samples_navtree_data.js to sort projects group tag.
30ce050d00330936ebfc4125c3c12f470ef38a96 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 492b5fc3: am 56257f3f: Merge "Modify format of samples_navtree_data.js to sort projects group tag." into jb-mr2-docs

* commit '492b5fc39737a523a1d4c2d5cef1502446ef3ef1':
Modify format of samples_navtree_data.js to sort projects group tag.
492b5fc39737a523a1d4c2d5cef1502446ef3ef1 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 56257f3f: Merge "Modify format of samples_navtree_data.js to sort projects group tag." into jb-mr2-docs

* commit '56257f3f5266999e251fa4bde22f9495e70032f7':
Modify format of samples_navtree_data.js to sort projects group tag.
56257f3f5266999e251fa4bde22f9495e70032f7 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> Merge "Modify format of samples_navtree_data.js to sort projects group tag." into jb-mr2-docs
815f9342d2b82cf61e56e64cbea46079215041be 12-Sep-2013 Dirk Dougherty <ddougherty@google.com> Modify format of samples_navtree_data.js to sort projects group tag.

Change-Id: I3155cdff749640100436feec6eb9f1cff36a5229
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/SampleCode.java
4977db1c3d292086c1d8e16e9f4ac6eb1d2ccf7a 11-Sep-2013 Dirk Dougherty <ddougherty@google.com> am a821585f: am 6fa13bb8: am b4d562ba: Normalize values for page.tags. Values can now be declared with quotes or not. Multiple values must still be comma delimited.

* commit 'a821585fae04096334af2b7a6e6c40bc6f2e3de5':
Normalize values for page.tags. Values can now be declared with quotes or not. Multiple values must still be comma delimited.
a821585fae04096334af2b7a6e6c40bc6f2e3de5 11-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 6fa13bb8: am b4d562ba: Normalize values for page.tags. Values can now be 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.
6fa13bb8340485bb868d26dc76a4faf7492c5df7 11-Sep-2013 Dirk Dougherty <ddougherty@google.com> am b4d562ba: Normalize values for page.tags. Values can now be declared with 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.
b4d562baab474d1c96a81cc6dc9e3e3a543a91c2 06-Sep-2013 Dirk Dougherty <ddougherty@google.com> Normalize values for page.tags. Values can now be declared with quotes or not. Multiple values must still be comma delimited.

Change-Id: I869a0b9ac7b7a9446bddb6560354121def91d186
rc/com/google/doclava/Doclava.java
fee677aa1f72042fae623ec258ff07e01f7a3c3d 06-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 87cdac6d: am 7e78f751: am e52f6d81: Transition sample code projects overviews to _index.jd.

* commit '87cdac6d3b4e82ad87ecfe344469f5c080553e54':
Transition sample code projects overviews to _index.jd.
87cdac6d3b4e82ad87ecfe344469f5c080553e54 06-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 7e78f751: am e52f6d81: Transition sample code projects overviews to _index.jd.

* commit '7e78f751215cf8774be4717b1611418e55383773':
Transition sample code projects overviews to _index.jd.
7e78f751215cf8774be4717b1611418e55383773 06-Sep-2013 Dirk Dougherty <ddougherty@google.com> am e52f6d81: Transition sample code projects overviews to _index.jd.

* commit 'e52f6d819e7d95e19e9b315f358bb7ac293413d8':
Transition sample code projects overviews to _index.jd.
e52f6d819e7d95e19e9b315f358bb7ac293413d8 05-Sep-2013 Dirk Dougherty <ddougherty@google.com> Transition sample code projects overviews to _index.jd.

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
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/Errors.java
rc/com/google/doclava/SampleCode.java
eff672d78bc03bab56d606d3cf32d9d7b385f13a 04-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 98dde387: am 14f84acc: am 25586c08: Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.

* commit '98dde387593abf1765cdb71346d87a8c2a166b59':
Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.
98dde387593abf1765cdb71346d87a8c2a166b59 04-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 14f84acc: am 25586c08: Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.

* commit '14f84acc589cdd957415290ab9c41ac47d219785':
Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.
14f84acc589cdd957415290ab9c41ac47d219785 04-Sep-2013 Dirk Dougherty <ddougherty@google.com> am 25586c08: Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.

* commit '25586c08d0a5068159d1c9482f0eaec0d8cc3d50':
Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.
25586c08d0a5068159d1c9482f0eaec0d8cc3d50 31-Aug-2013 Dirk Dougherty <ddougherty@google.com> Concatenate navtree dirs that hold other dirs only. Adjust sorting of dir contents.

Change-Id: I49e67a8ab09bb3b6d411201d4e51a80c477929b4
rc/com/google/doclava/SampleCode.java
21fa3f8fb02269680951d3b97ea42d14ead97697 27-Aug-2013 Dirk Dougherty <ddougherty@google.com> am 70bd06bb: am a0914e36: am da7497f5: Limit sample code html generator in online mode, sort file lists by type and name.

* commit '70bd06bbb85d48f1fd33a4ee3be2f3941c876759':
Limit sample code html generator in online mode, sort file lists by type and name.
5345dede1a9bca72e6179cdba212cb2f7043a760 27-Aug-2013 Dirk Dougherty <ddougherty@google.com> am 9b944d93: am c318bf73: am c11a4671: Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.

* commit '9b944d9323ae19f25bf030580c8a2ca8aaec5cd5':
Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.
70bd06bbb85d48f1fd33a4ee3be2f3941c876759 26-Aug-2013 Dirk Dougherty <ddougherty@google.com> am a0914e36: am da7497f5: Limit sample code html generator in online mode, sort file lists by type and name.

* commit 'a0914e36a841b0899fa013f8d73a6fd31186f3fc':
Limit sample code html generator in online mode, sort file lists by type and name.
a0914e36a841b0899fa013f8d73a6fd31186f3fc 26-Aug-2013 Dirk Dougherty <ddougherty@google.com> am da7497f5: Limit sample code html generator in online mode, sort file lists by type and name.

* commit 'da7497f52aae4ee0daff01cb2db0540dcb8e3fae':
Limit sample code html generator in online mode, sort file lists by type and name.
da7497f52aae4ee0daff01cb2db0540dcb8e3fae 23-Aug-2013 Dirk Dougherty <ddougherty@google.com> Limit sample code html generator in online mode, sort file lists by type and name.

Change-Id: I9d22a1886561bf80d59e433943851fbc2a1df87b

Conflicts:
src/com/google/doclava/SampleCode.java
rc/com/google/doclava/Doclava.java
9b944d9323ae19f25bf030580c8a2ca8aaec5cd5 26-Aug-2013 Dirk Dougherty <ddougherty@google.com> am c318bf73: am c11a4671: Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.

* commit 'c318bf738f631407360bc0a468990ec4e40e6fc4':
Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.
c318bf738f631407360bc0a468990ec4e40e6fc4 26-Aug-2013 Dirk Dougherty <ddougherty@google.com> am c11a4671: Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.

* commit 'c11a467135f9118604f31fadc99d2edd494edb0b':
Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.
c11a467135f9118604f31fadc99d2edd494edb0b 24-Aug-2013 Dirk Dougherty <ddougherty@google.com> Sort samples navtree items by type and name. Clean up page vars to support breadcrumb.

Change-Id: I83fc8f387df03447f48f1a29b0d68c1868f2bed1
rc/com/google/doclava/SampleCode.java
ee0707bb6c16c6e3f1146d8f5b2a0dfb87286c0a 22-Aug-2013 Scott Main <smain@google.com> am 37916d3a: am 08109d83: am 19469c94: Merge "modify markup for sample code blocks to create line numbers w/o a list" into jb-mr2-docs

* commit '37916d3ae8e92389805b8ab8678586aa7e7f1211':
modify markup for sample code blocks to create line numbers w/o a list
37916d3ae8e92389805b8ab8678586aa7e7f1211 22-Aug-2013 Scott Main <smain@google.com> am 08109d83: am 19469c94: Merge "modify markup for sample code blocks to 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
08109d839d2eac3ed83f6a391a97962550e29483 22-Aug-2013 Scott Main <smain@google.com> am 19469c94: Merge "modify markup for sample code blocks to create line 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
19469c944158507125889909b1c81f5a88524be1 22-Aug-2013 Scott Main <smain@google.com> Merge "modify markup for sample code blocks to create line numbers w/o a list" into jb-mr2-docs
1d4ac16b12fa3ef7e2069ce04583ce290c31b735 22-Aug-2013 Adam Metcalf <gamblore@google.com> Merge "Unhide package of class that is shown by annotation."
f2d2e93f552d699dc3dc58fb450b7e7a50128da0 20-Aug-2013 Adam Metcalf <gamblore@google.com> Unhide package of class that is shown by annotation.

Change-Id: Ia3c6817ef984b30d5a9a89dcd49f53f7baf34df0
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/PackageInfo.java
d95a1f9739d03eebd07fc94ae4ee11203e6d5e94 22-Aug-2013 Scott Main <smain@google.com> modify markup for sample code blocks to create line numbers w/o a list

Change-Id: I8d4da266458e1ae281ca5711bf17f0f35bb8511d
rc/com/google/doclava/SampleTagInfo.java
11457b7a3d59077ed373b1f15eb8bdb58721e014 21-Aug-2013 Dirk Dougherty <ddougherty@google.com> am dd0f0ec8: am ae09006e: Disable generation of sample code html for offline docs builds.

* commit 'dd0f0ec82398191050e45fb98d32ffedb028d7b9':
Disable generation of sample code html for offline docs builds.
dd0f0ec82398191050e45fb98d32ffedb028d7b9 21-Aug-2013 Dirk Dougherty <ddougherty@google.com> am ae09006e: Disable generation of sample code html for offline docs builds.

* commit 'ae09006e30c95b33931ba8127dad7474815ca58b':
Disable generation of sample code html for offline docs builds.
ae09006e30c95b33931ba8127dad7474815ca58b 21-Aug-2013 Dirk Dougherty <ddougherty@google.com> Disable generation of sample code html for offline docs builds.

Change-Id: I2b17622ac1c98da5c8ebde96c4b1b3d563164d69
rc/com/google/doclava/Doclava.java
9204806ec68527334df489f39faf48a37d3045c4 20-Aug-2013 Dirk Dougherty <ddougherty@google.com> am 20a64d87: am 1b45d1d0: doc change: Samples browsing: starter templates and navtree gen support.

* commit '20a64d87333ff1ca51337d82f09695063e4964e7':
doc change: Samples browsing: starter templates and navtree gen support.
20a64d87333ff1ca51337d82f09695063e4964e7 20-Aug-2013 Dirk Dougherty <ddougherty@google.com> am 1b45d1d0: doc change: Samples browsing: starter templates and navtree gen support.

* commit '1b45d1d08a4ff984e1d0741dd13f0759f6527ebf':
doc change: Samples browsing: starter templates and navtree gen support.
1b45d1d08a4ff984e1d0741dd13f0759f6527ebf 18-Aug-2010 Dirk Dougherty <ddougherty@google.com> doc change: Samples browsing: starter templates and navtree gen support.

Change-Id: I03f5eec1dcb71e96fed2ba0119a0b2c0bba56f49
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/SampleCode.java
rc/com/google/doclava/SampleTagInfo.java
rc/com/google/doclava/SinceTagger.java
93ffcf4e531330bcfedfb160ad2a83ad4f7c08a5 14-Aug-2013 Scott Main <smain@google.com> am 09ce528e: am 18904806: fix doclava to tag enums with \'since\' info

* commit '09ce528ec5786254f6f1af6359c344d673ca80ad':
fix doclava to tag enums with 'since' info
09ce528ec5786254f6f1af6359c344d673ca80ad 14-Aug-2013 Scott Main <smain@google.com> am 18904806: fix doclava to tag enums with \'since\' info

* commit '189048062a7df2d2fba4ff075c6416bfbf05a094':
fix doclava to tag enums with 'since' info
189048062a7df2d2fba4ff075c6416bfbf05a094 07-Aug-2013 Scott Main <smain@google.com> fix doclava to tag enums with 'since' info

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
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/SinceTagger.java
ca26d47d656052ca1012b42f24e5ab13f9349006 19-Jul-2013 Adam Metcalf <gamblore@google.com> Add Gradle build file to make Doclava.

Change-Id: I6148ca5b215ab6dd8d4e9a5cef8e63d29668d232
uild.gradle
864c6b3a9873601593ad12a656de938ac37c7240 13-Jun-2013 Elliott Hughes <enh@google.com> am 73609593: Merge "Check that return types are assignable instead of exact."

* commit '736095934f50fede95f2cb1bb54cc24493c6e69a':
Check that return types are assignable instead of exact.
736095934f50fede95f2cb1bb54cc24493c6e69a 13-Jun-2013 Elliott Hughes <enh@google.com> Merge "Check that return types are assignable instead of exact."
11b179627c411772f1eac023d915ab8532e55211 08-Jun-2013 Mathieu <mathieu.a.chartier@gmail.com> Check that return types are assignable instead of exact.

We now check that the new return type is assignable to the old
return type instead of just comparing the types as strings when
checking the consistency of two APIs.

Fixes:
https://android-review.googlesource.com/#/c/58843/

Change-Id: I6a18a76e5296d58c05f1bb59341cdaa820f0c540
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/PackageInfo.java
rc/com/google/doclava/apicheck/ApiInfo.java
est/api/changed-assignable-return-1.xml
est/api/changed-assignable-return-2.xml
est/doclava/ApiCheckTest.java
607013b3acf74e097652d1444f49fadd4c36cf2d 06-Jun-2013 Elliott Hughes <enh@google.com> am 5d01254b: Merge "Fix a failing test."

* commit '5d01254b0cc6c1fe5f01ad6ac631ae631ce39744':
Fix a failing test.
5d01254b0cc6c1fe5f01ad6ac631ae631ce39744 06-Jun-2013 Elliott Hughes <enh@google.com> Merge "Fix a failing test."
48bd9fd589daaa11705dce8480c5b51f5b4a9e0f 06-Jun-2013 Elliott Hughes <enh@google.com> Fix a failing test.

We fixed the behavior with 'synchronized' a long time ago, but didn't
update the test.

Also add a reminder of how to run the tests, in lieu of adding an easy
way to run the tests.

Change-Id: I628ca5b054f777b1b19823cede05e196f8e6a685
ndroid.mk
est/doclava/ApiCheckTest.java
8de1e455a8415726b390785e5d7c20f5d7d9ee1d 06-Jun-2013 Elliott Hughes <enh@google.com> am 4c54273b: Merge "Check superclasses recursively for changed superclasses."

* commit '4c54273b5fcc7012024858387dc36033d6d37d50':
Check superclasses recursively for changed superclasses.
4c54273b5fcc7012024858387dc36033d6d37d50 06-Jun-2013 Elliott Hughes <enh@google.com> Merge "Check superclasses recursively for changed superclasses."
ffecf3c5c207d0275d480970fd025cb9526b1905 06-Jun-2013 Mathieu <mathieu.a.chartier@gmail.com> Check superclasses recursively for changed superclasses.

We now check superclasses recursively instead of just doing a string comparison.
This means that we no longer treat cases where the new superclass extends the old
superclass as an error.

Fixes https://android-review.googlesource.com/#/c/58400/1

Change-Id: I77ebb7312d0de83faed7dce0195682848256af73
rc/com/google/doclava/ClassInfo.java
est/api/inserted-super-1.xml
est/api/inserted-super-2.xml
est/doclava/ApiCheckTest.java
4eaced86ed5e1d289c65d8a5f2e23b8f010e7c90 06-Jun-2013 Elliott Hughes <enh@google.com> am 3ee7bb80: Merge "Provide superclassType along with superclass"

* commit '3ee7bb80f19079ea5a3ce303ea60e825aa65a3a2':
Provide superclassType along with superclass
3ee7bb80f19079ea5a3ce303ea60e825aa65a3a2 06-Jun-2013 Elliott Hughes <enh@google.com> Merge "Provide superclassType along with superclass"
bf322c1b64a9a7f2aade8ba499fcec4bd141a688 06-Jun-2013 Elliott Hughes <enh@google.com> Provide superclassType along with superclass

Follow up to previous change which fixed the API docs but not the API stubs:

commit d894afa28c3fba1aa71058601693617746494a22
Author: Mathieu Chartier <mathieuc@google.com>
Date: Fri Sep 21 15:42:59 2012 -0700

Change hidden super class to use first non-hidden super class

When a subclass has a hidden super class, we now use the first super
class which passes checkLevel as the new super class.

(cherry pick of 0d7a3dd87f2173e8e7d0813c52c042d932b61cff.)

Change-Id: I09e2158328e8fc227c31c6763a30522f073ac2a8
rc/com/google/doclava/Stubs.java
ed1ed6dafc92f59aef87c5cd5da04a26b39990a4 06-Jun-2013 Elliott Hughes <enh@google.com> am ce9e9aad: Merge "Change hidden super class to use first non-hidden super class"

* commit 'ce9e9aadc5fd3033d67b247b3d6c66318749d52f':
Change hidden super class to use first non-hidden super class
ce9e9aadc5fd3033d67b247b3d6c66318749d52f 06-Jun-2013 Elliott Hughes <enh@google.com> Merge "Change hidden super class to use first non-hidden super class"
2da2d64196a401f664644619160f8a33eda77d9a 22-Sep-2012 Mathieu Chartier <mathieuc@google.com> Change hidden super class to use first non-hidden super class

When a subclass has a hidden super class, we now use the first super
class which passes checkLevel as the new super class.

(cherry-pick of d894afa28c3fba1aa71058601693617746494a22.)

Change-Id: I8e92ac18575f86081192443e0055a2c42d28c3c3
rc/com/google/doclava/Stubs.java
7791802d9b43c2067b566bf81667096ed91decb8 21-May-2013 Scott Main <smain@google.com> don't generate the jd_lists.js file for search suggestions unless there are actual files to process

Change-Id: I3b40afb151885bdb6c0e235be0fe4f76370598f8
rc/com/google/doclava/Doclava.java
ab4b1bfd89849b59f2c485d5fc620bdc0a3a8ade 30-Apr-2013 Scott Main <smain@google.com> am 68a238ae: add deprecated true/false to lists.js to help sort search suggestions

* commit '68a238ae4243e6f0f2a370b8b915ef0686ca0b37':
add deprecated true/false to lists.js to help sort search suggestions
68a238ae4243e6f0f2a370b8b915ef0686ca0b37 30-Apr-2013 Scott Main <smain@google.com> add deprecated true/false to lists.js to help sort search suggestions

Change-Id: Ia34c5139bc637ce24a91aef830356606e4c7a4c2
es/assets/templates/lists.cs
rc/com/google/doclava/DocInfo.java
rc/com/google/doclava/Doclava.java
b343c5e32cbf4d48afad50c9adb2e66a6b0fd74b 30-Apr-2013 Dirk Dougherty <ddougherty@google.com> am 50dbdd4d: am e65daec6: Add doclava command line option to bypass copying of default doclava assets dir to output.

* commit '50dbdd4d8a37462b746c1d2a31116cae63246524':
Add doclava command line option to bypass copying of default doclava assets dir to output.
50dbdd4d8a37462b746c1d2a31116cae63246524 30-Apr-2013 Dirk Dougherty <ddougherty@google.com> am e65daec6: Add doclava command line option to bypass copying of default doclava assets dir to output.

* commit 'e65daec66ebdf02baa00c0ee403321fa304f7ad5':
Add doclava command line option to bypass copying of default doclava assets dir to output.
e65daec66ebdf02baa00c0ee403321fa304f7ad5 30-Apr-2013 Dirk Dougherty <ddougherty@google.com> Add doclava command line option to bypass copying of default doclava assets dir to output.

Change-Id: Idb4425fcc7cf709efa22bab3876cc108c4ab7f9d
rc/com/google/doclava/Doclava.java
d04f64cd3809d5c03f5964e6814c8ff6fd5b316a 12-Apr-2013 Scott Main <smain@google.com> am 489864e7: add ability to manually exclude files from search suggestions.

* commit '489864e7dd2eee3f6a90919e5084964ad4d8b3c7':
add ability to manually exclude files from search suggestions.
489864e7dd2eee3f6a90919e5084964ad4d8b3c7 12-Apr-2013 Scott Main <smain@google.com> add ability to manually exclude files from search suggestions.

Use the hdf tag excludeFromSuggestions=true

Change-Id: If2f0f0f19f0e3b27adf69e09b9527e8d97213db5
rc/com/google/doclava/Doclava.java
66c94d3d7300566e5bcc0fbd3c4612d2488c1906 12-Apr-2013 Scott Main <smain@google.com> am 9950dd09: strip <span> tags from document titles for search suggest

* commit '9950dd094869cc176d63050a9e1ac3d0b4053f84':
strip <span> tags from document titles for search suggest
9950dd094869cc176d63050a9e1ac3d0b4053f84 12-Apr-2013 Scott Main <smain@google.com> strip <span> tags from document titles for search suggest

Change-Id: I7fcae84660f174b8c6afd2166b38f1686ff16bdd
rc/com/google/doclava/Doclava.java
08f154f1c281115bd86c6ea4a2214177e2372732 11-Apr-2013 Scott Main <smain@google.com> am 71bf8d2a: add logic to doclava to generate meta-data JSON for .jd files. This will be used to provide search suggestions for all docs, and also automated "see also" links in doc TOC for pages w/ matching tags

* commit '71bf8d2ae787c28691910bb228a5d9efca9b153d':
add logic to doclava to generate meta-data JSON for .jd files. This will be used to provide search suggestions for all docs, and also automated "see also" links in doc TOC for pages w/ matching tags
71bf8d2ae787c28691910bb228a5d9efca9b153d 09-Mar-2013 Scott Main <smain@google.com> add logic to doclava to generate meta-data JSON for .jd files.
This will be used to provide search suggestions for all docs,
and also automated "see also" links in doc TOC for pages w/ matching tags

Change-Id: I0aefc929bc97ad6eaee77c7094d23c7f57afdf7b
es/assets/templates/jd_lists.cs
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
92f56c6130ce2f0358dfde8ea41450c8767402be 06-Apr-2013 Scott Main <smain@google.com> am 74c2081b: if there\'s no api level available for deprecated version, provide different message

* commit '74c2081b80e20f7851af91aff33aee263a7282f8':
if there's no api level available for deprecated version, provide different message
74c2081b80e20f7851af91aff33aee263a7282f8 05-Apr-2013 Scott Main <smain@google.com> if there's no api level available for deprecated version, provide different message

Change-Id: I7268d2bc7cdbcfb08cafd5249f9b6c51e42c4bc2
es/assets/templates/macros.cs
722ac6ad427cab1d8d6daba6bd100afa9dd94fb7 02-Apr-2013 Jeff Brown <jeffbrown@google.com> apicheck: Handle more special cases for final.

It's ok to make a method final if it belongs to a class
that is effectively final (no public constructors).

Change-Id: I6c497e68a91f99eee124e9dbe3d075c6672c4615
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/MethodInfo.java
43d2ac8017a651b5678c8a9753248663d8bfe9a7 01-Apr-2013 Jeff Brown <jeffbrown@google.com> apicheck: Allow safe addition and removal of final qualifier.

Split the CHANGED_FINAL error into ADDED_FINAL,
ADDED_FINAL_UNINSTANTIABLE and REMOVED_FINAL so that the
API check scripts can more precisely target policy around
changes to the final qualifier.

ADDED_FINAL_UNINSTANTIABLE covers the case of a class
that has become final but that was previously not
instantiable. This change is safe since applications could
not have declared subclasses of their own.

Change-Id: I36a143bdbcffd04379788a55ff996b47398ba4fe
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Errors.java
rc/com/google/doclava/FieldInfo.java
rc/com/google/doclava/MethodInfo.java
1cbfda3f198c971ca91ef256f5c9739fa6167a8e 16-Mar-2013 Robert Ly <robertly@google.com> am 4c95e6c9: remove file type check for s.a.c

* commit '4c95e6c9a7c559fd66e8085c239832d505d4fbf9':
remove file type check for s.a.c
4c95e6c9a7c559fd66e8085c239832d505d4fbf9 15-Mar-2013 Robert Ly <robertly@google.com> remove file type check for s.a.c

Change-Id: I926b2e189cb6eee3ec81e69886a917ddd6b73a85
rc/com/google/doclava/ClearPage.java
87ededa470e30c1808973e172306234acb4ece3c 22-Feb-2013 Robert Ly <robertly@google.com> am 57657b93: Revert "add support for differently named lists.js files"

* commit '57657b935a6aefc36b2a7f5704665e4da818c3e6':
Revert "add support for differently named lists.js files"
57657b935a6aefc36b2a7f5704665e4da818c3e6 21-Feb-2013 Robert Ly <robertly@google.com> Revert "add support for differently named lists.js files"

This reverts commit f2a427d942636370bafe20d3852622f026f2511f

Change-Id: I190c9e95af040a7ff384f211649fb766a1b6e805
rc/com/google/doclava/Doclava.java
cfd9d3055d37e4c17c3dff01e51060f60db66e2b 21-Feb-2013 Robert Ly <robertly@google.com> am f2a427d9: add support for differently named lists.js files

* commit 'f2a427d942636370bafe20d3852622f026f2511f':
add support for differently named lists.js files
f2a427d942636370bafe20d3852622f026f2511f 20-Feb-2013 Robert Ly <robertly@google.com> add support for differently named lists.js files

Change-Id: I5eaf20ad661a5582c45e30b9bed308d9714f02e3
rc/com/google/doclava/Doclava.java
f97d22e39370d9dec603b74398024bca1e23b4b2 12-Feb-2013 Robert Ly <robertly@google.com> am 88c435bb: update doclava for s.a.c redesign

# Via Robert Ly
* commit '88c435bb4d6c81c41107e23503b59af2e08acd8d':
update doclava for s.a.c redesign
88c435bb4d6c81c41107e23503b59af2e08acd8d 01-Feb-2013 Robert Ly <robertly@google.com> update doclava for s.a.c redesign

Change-Id: I4788472ea2ba923070362624f75fe72bf5b43df7

Conflicts:
src/com/google/doclava/ClearPage.java
rc/com/google/doclava/ClearPage.java
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/SampleCode.java
b3dcaae04bb1bcdffa879553df8c7bdda8cd6079 05-Feb-2013 Dirk Dougherty <ddougherty@google.com> am a75af371: Temporarily add a content type to fix builds.

# Via Dirk Dougherty
* commit 'a75af37150ebca7cdca4869b72948ae0ac5abfc3':
Temporarily add a content type to fix builds.
a75af37150ebca7cdca4869b72948ae0ac5abfc3 05-Feb-2013 Dirk Dougherty <ddougherty@google.com> Temporarily add a content type to fix builds.

Change-Id: Idf312809ef2f413b49f9ec35f3dac68647b3fe8c
rc/com/google/doclava/ClearPage.java
1d1e590b9fb32d48a53d0b8ceacb2fd3b84f3412 05-Feb-2013 Scott Main <smain@google.com> am 5bc5316d: add timestamp.cs to doclava to fix break (unknown dependencies for doc builds)

# Via Scott Main
* commit '5bc5316d9b25c017446d44d87fbc98f754d10afb':
add timestamp.cs to doclava to fix break (unknown dependencies for doc builds)
1f199b97065cba3e5d10f09859b7934c47b455ed 05-Feb-2013 Scott Main <smain@google.com> am 460dd2aa: remove condition for devsite and use the timestamp js for all doc builds

# Via Scott Main
* commit '460dd2aa33a4e4666eb05f7a26f335e2a012dbb7':
remove condition for devsite and use the timestamp js for all doc builds
516d61296d86e0b49edbde3bc72a8c434c44079e 05-Feb-2013 Dirk Dougherty <ddougherty@google.com> resolved conflicts for merge of 9b316c84 to master

Change-Id: Ic5b0374982fcf07d6beaba8806d4dae23173d504
5bc5316d9b25c017446d44d87fbc98f754d10afb 30-Jan-2013 Scott Main <smain@google.com> add timestamp.cs to doclava to fix break (unknown dependencies for doc builds)

Change-Id: I3cc0675dfc6bd58c0eac3e4dc146816bcfe8f34b
es/assets/templates/timestamp.cs
460dd2aa33a4e4666eb05f7a26f335e2a012dbb7 29-Jan-2013 Scott Main <smain@google.com> remove condition for devsite and use the timestamp js for all doc builds

Change-Id: I91028cd92ae81dafb1b5c1b75bd74dbac0efbf70
rc/com/google/doclava/ClearPage.java
rc/com/google/doclava/Doclava.java
9b316c84e2e15268db79772d9cef60da1df488ec 28-Jan-2013 Dirk Dougherty <ddougherty@google.com> Doclava: add support for a second html dir and associated output. This is primarily for devsite online docs builds. Also move ca151a9bbea066b0efd0e423bcade8895a83db71 and related changes into production docs branch.

Change-Id: Idc95c4e396713eb592b8d1ffd60d93ee89472e97
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/ClearPage.java
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/Errors.java
rc/com/google/doclava/MemberInfo.java
1c0d841f63bbf1a576bdcf403f1f5edc55661982 17-Dec-2012 Scott Main <smain@google.com> am 0901a614: another fix to remove generics info from sidenav. they were still appearing in the nav while viewing a package page. bug: 7242415

* commit '0901a614686e63ca81e0c790f22de1fae09c2c0c':
another fix to remove generics info from sidenav. they were still appearing in the nav while viewing a package page. bug: 7242415
0901a614686e63ca81e0c790f22de1fae09c2c0c 17-Dec-2012 Scott Main <smain@google.com> another fix to remove generics info from sidenav.
they were still appearing in the nav while viewing a package page.
bug: 7242415

Change-Id: Ic7ad8f9e8ff4266a0d3d8608a9484f5d6e1ae7fb
es/assets/templates/macros.cs
55286ea3386c988171ea08ac3a2f712c6516c931 01-Dec-2012 Scott Main <smain@google.com> am 4ec568b9: more fixing for tags: provide proper links for @value tags.

* commit '4ec568b934dab55eca62a72e4b1ed48924f87460':
more fixing for tags: provide proper links for @value tags.
4ec568b934dab55eca62a72e4b1ed48924f87460 01-Dec-2012 Scott Main <smain@google.com> more fixing for tags: provide proper links for @value tags.

Change-Id: I5f90baf6f774b1c297e4833c98633cc6f675de30
es/assets/templates/macros.cs
rc/com/google/doclava/Comment.java
rc/com/google/doclava/TagInfo.java
15b80cd81cbd1f5ad9a4fe71929878be55be3035 01-Dec-2012 Scott Main <smain@google.com> am f19066f1: fix build

* commit 'f19066f11fc29bb0c6f3b3044c7ecf21fc47f62d':
fix build
f19066f11fc29bb0c6f3b3044c7ecf21fc47f62d 01-Dec-2012 Scott Main <smain@google.com> fix build

Change-Id: Ie236aaf6236ca2e5b8ed9c6756d3e95c8e8e9060
rc/com/google/doclava/Comment.java
a66cc63905d44c1778cb2898ebe45976e7429355 01-Dec-2012 Scott Main <smain@google.com> am 99e4ebe5: further support for @value tag to print fully qualified name

* commit '99e4ebe5b938186f02d1deb0d46ac0e72db2e0b2':
further support for @value tag to print fully qualified name
99e4ebe5b938186f02d1deb0d46ac0e72db2e0b2 01-Dec-2012 Scott Main <smain@google.com> further support for @value tag to print fully qualified name

Change-Id: If8561cd174b89eacf8928c3bd0665b6502c29e5b
rc/com/google/doclava/Comment.java
16832f1766143174532de575fcfb9e31bd62bb49 01-Dec-2012 Scott Main <smain@google.com> am e94aecfe: add support for @value tag

* commit 'e94aecfe57368dd3df62be49d08d6a5684cf929f':
add support for @value tag
e94aecfe57368dd3df62be49d08d6a5684cf929f 01-Dec-2012 Scott Main <smain@google.com> add support for @value tag

Change-Id: Ie2f747dff3642e22b12b9d68439d2a262fc159c7
es/assets/templates/macros.cs
rc/com/google/doclava/Comment.java
a4138320e915efe1d4881d2b1961e7ef690a9dc3 30-Nov-2012 Robert Ly <robertly@google.com> am 5ab9cb53: add support for gms and gcm javadocs

* commit '5ab9cb535d77c7d83fabac028bbf13b2d27e0e63':
add support for gms and gcm javadocs
5ab9cb535d77c7d83fabac028bbf13b2d27e0e63 30-Nov-2012 Robert Ly <robertly@google.com> add support for gms and gcm javadocs

Change-Id: Ibf1465f8f8b3f8a419c8f2b36b3bff96826ba89f
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/NavTree.java
ca151a9bbea066b0efd0e423bcade8895a83db71 13-Nov-2012 Jeff Hamilton <jham@android.com> Allow show annotations on fields and methods.

Change-Id: I2556eae6cd8e84345040ad7a0c0bc7b33dda1536
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/MemberInfo.java
58460224d368b93f5aa6a22a73b0bfe7e79f07b1 06-Nov-2012 Maurice Chu <mochu@google.com> Fix NPE when looking for annotation in isHiddenImpl()

Change-Id: Idaebcf456ffe06d0147436986975081bf1162699
rc/com/google/doclava/ClassInfo.java
eb9343ecf5a1b2d324445db39195bcfc9dd01ebf 06-Nov-2012 Maurice Chu <mochu@google.com> Added -showAnnotation option to DocLava

The -showAnnotation command-line option specified the fully
qualified classname for an @interface declaration, which if
present on a class, method, or field, will override any @hide
annotations in the javadoc comments.

Bug: 7457598
Change-Id: I4f21d9bacf60875c1b7444bb9139091e9a505bb5
ndroid-changes.txt
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Doclava.java
c60a46c6e4921a6d2f4a0cb6a170ce39ffd5947c 25-Oct-2012 Scott Main <smain@google.com> cherypick from jb-dev-docs
Change-Id: I1d7b357c6c7fa172cc0099c489072665e8a35a85

fix whitespace for "since" api level
es/assets/templates/macros.cs
40ad14799644f497483efe6d1350c856d46bc4da 25-Oct-2012 Scott Main <smain@google.com> cherrypick Change-Id: Ic7cc0864518fef95b106ab3d392c47eb225404bf
Add HDF meta-data for the version in which an API was deprecated

Change-Id: Iadaceb6d61d2fbc75d219295da2d8d7b52bd2eeb
es/assets/templates/macros.cs
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/DocInfo.java
rc/com/google/doclava/FieldInfo.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/SinceTagger.java
ccc2f8e31967148d1da01b8b8118f74fd07d5d58 06-Oct-2012 Scott Main <smain@google.com> cherry pick from jb-dev-docs
Change-Id: I87accadfadc9d4535f3c4aed1b4bcebb05a38454

don't show generics declarations in the sidenav
this requires adding a second "override" method to take an argument
specifying whether the link is for the sidenav, so that we still
show the generics info in other places such as where the class is
cited as a method argument.

bug: 7242415
es/assets/templates/macros.cs
b5a988086b7e6c1677640e297b5323adbd212a16 30-Aug-2012 Jeff Hamilton <jham@android.com> Merge branch 'goog/froyo-ub-gcore-asiago' into jb-mr1-dev

This brings over changes for creating ProGuard keep lists
aimed at obfuscating @hide's out of static libraries.

It also includes changes from code.google.com to support
federation, and local fixes for federation support as well.
72ce82e8e05446aa3b7e163c84d4c23e58552ad6 28-Aug-2012 Jeff Hamilton <jham@android.com> Cleanup some debugging output.

Change-Id: I6f23b22434cc1981ad1cdd05d7467b1775075f94
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/SeeTagInfo.java
18b25554072c36d4d9652523ec15e0c5306101ce 09-Aug-2012 Chirag Shah <chirags@google.com> Patch in Brett Johnson's changes from DocLava to support yaml.

http://code.google.com/p/doclava/source/detail?r=335
http://code.google.com/p/doclava/source/detail?r=336

Change-Id: I624f9ac1a8166e5590a845a55c2a6e51d2a078b4
es/assets/templates/yaml_navtree.cs
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/NavTree.java
550a9de05d89f19d1f824fbbb04ba7cd8a1ff86e 24-Jul-2012 Jeff Hamilton <jham@android.com> Turns out passing an array for varargs works.

Change-Id: I653b860c9e21f6685b5ad6c67a83702034d09db9
rc/com/google/doclava/Stubs.java
d6f2c2b6edce46c86581be1f508981742e20fb51 24-Jul-2012 Jeff Hamilton <jham@android.com> Fix arrays on primitives and varargs.

ProGuard doesn't like varargs with Type...
so instead use just ... for the argument
catchall.

Change-Id: Ib25568acd765e3306115ae5690967ab42f2559b4
rc/com/google/doclava/Stubs.java
9c584846aff32976d94246c7682a980346d12f44 25-Jun-2012 Jeff Hamilton <jham@android.com> Fix federation for @link

Change-Id: I1bee6d87df69f0f04324102e6324d0fc4aca3195
rc/com/google/doclava/FederationTagger.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/SeeTagInfo.java
rc/com/google/doclava/TypeInfo.java
1e0d370c6a4c165cb8c74f53cb035e5521e0cd87 21-Jun-2012 Jeff Hamilton <jham@android.com> Port over r184 from SVN.

This adds the ability to specify the federation
API definition file locally.

Also fix a bug when parsing doubles and floats
found in 8.xml.

Change-Id: I435298444fcd0337407c09af446cf375d06adc51
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/FederatedSite.java
rc/com/google/doclava/FederationTagger.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/Stubs.java
rc/com/google/doclava/apicheck/ApiFile.java
6aa428d59fac17013597689fcb9741877d13281c 25-Jun-2012 Jeff Hamilton <jham@android.com> Properly handle array dimentions in keep lists.

Bug: 6722675
Change-Id: I6a372eadaf550cc04525c40b5d7cfac091669618
rc/com/google/doclava/Stubs.java
970f13f08e404fa1e265e7ab24050f5a8c6e4603 22-Jun-2012 Jeff Hamilton <jham@android.com> Add proper keep list generation.

Change-Id: I904336e64316318a1a7808c593fc9dfd10019820
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/Stubs.java
3c925b473212325cbf5f734cb5d1d57588ea83e3 22-Jun-2012 Scott Main <smain@google.com> Changes for dac2 design

Change-Id: I755581b3db5664d3db429185bb18de1ad7a471cb
es/assets/templates/macros.cs
rc/com/google/doclava/DocFile.java
6671ab7b94f8747e569f21f698ef4ed1ec772179 24-Apr-2012 Dirk Dougherty <ddougherty@google.com> am aae56c12: am dd4d20dd: am 880940ad: Doc change: add schema.org metadata.

* commit 'aae56c125e8f03dd09427faac163f9c224344f59':
6c6997ccbd5f7e657513752eea53faab125a6efc 24-Apr-2012 Dirk Dougherty <ddougherty@google.com> am f3cc38a6: am 60b98a38: am 880940ad: Doc change: add schema.org metadata.

* commit 'f3cc38a60ed4642f35b307602e2516f7bcd45ff1':
2e683e10d5c0459b11527f5b064b6829761d919c 20-Apr-2012 Dirk Dougherty <ddougherty@google.com> am 880940ad: Doc change: add schema.org metadata.

* commit '880940ad7dc601eecdd4317b4210b059a747ee2a':
Doc change: add schema.org metadata.
aae56c125e8f03dd09427faac163f9c224344f59 20-Apr-2012 Dirk Dougherty <ddougherty@google.com> am dd4d20dd: am 880940ad: Doc change: add schema.org metadata.

* commit 'dd4d20dd2efef0130d55951ba09c34693faef653':
f3cc38a60ed4642f35b307602e2516f7bcd45ff1 20-Apr-2012 Dirk Dougherty <ddougherty@google.com> am 60b98a38: am 880940ad: Doc change: add schema.org metadata.

* commit '60b98a38b83e2cdc3873392cca1356a6cd60989d':
Doc change: add schema.org metadata.
dd4d20dd2efef0130d55951ba09c34693faef653 20-Apr-2012 Dirk Dougherty <ddougherty@google.com> am 880940ad: Doc change: add schema.org metadata.

* commit '880940ad7dc601eecdd4317b4210b059a747ee2a':
Doc change: add schema.org metadata.
60b98a38b83e2cdc3873392cca1356a6cd60989d 20-Apr-2012 Dirk Dougherty <ddougherty@google.com> am 880940ad: Doc change: add schema.org metadata.

* commit '880940ad7dc601eecdd4317b4210b059a747ee2a':
Doc change: add schema.org metadata.
880940ad7dc601eecdd4317b4210b059a747ee2a 20-Apr-2012 Dirk Dougherty <ddougherty@google.com> Doc change: add schema.org metadata.

Change-Id: I17a799ff812eb66b647f26040f12ad0f651bd471
es/assets/templates/nosidenavpage.cs
de0f029b5e2b6c099504c9f89c294d2fea16944a 27-Mar-2012 Daniel Sandler <dsandler@android.com> Elucidate text API parsing errors.

Previously, if current.txt had an error, apicheck would fail over
to XML parsing and then (naturally) give an inscrutable SAX error.

Now both text and XML errors are described in the output
stream to help in diagnosing failures.

Change-Id: Ie3aec370b15e42ddf9a941ffa3ce8ae32a1da1b6
rc/com/google/doclava/apicheck/ApiCheck.java
fdd933c47e4b1904f1333fb7d9ac13b8e0a95748 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> am 70b82c71: am 4db60250: Reconcile with ics-mr1-release

* commit '70b82c719ea95d3b4b68c4cf5f0ef257120039f5':
70b82c719ea95d3b4b68c4cf5f0ef257120039f5 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> am 4db60250: Reconcile with ics-mr1-release

* commit '4db6025083ff4abff3e682d6b81ca40bf7e843fa':
4db6025083ff4abff3e682d6b81ca40bf7e843fa 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I254d144621e8a8cc5e5956489b9cfd2e4dd927aa
eff428d4812ac9c52d77cc2de589c7fa090a5848 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> am f0631ff3: Reconcile with ics-mr1-release

* commit 'f0631ff39075e7da2fcae7b52c68a0ad3b0abfd1':
f0631ff39075e7da2fcae7b52c68a0ad3b0abfd1 21-Mar-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Ia57adebd52f816b4c6ba17221867ddd9bcc3fa3b
81b80b038d26b3b366eec7ab397191260ce7f067 10-Mar-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
20c0cc7f065fd46b44df65789ddd7d297c176ce1 10-Mar-2012 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
d7e85e504e270006e668b38d5d426cb5be297704 08-Mar-2012 Roman Nurik <romannurik@google.com> am 3352706b: Add custom template for /design path

* commit '3352706b85f0c1aa8a0391b26c08c8b6f9e5746f':
Add custom template for /design path
3352706b85f0c1aa8a0391b26c08c8b6f9e5746f 06-Mar-2012 Roman Nurik <romannurik@google.com> Add custom template for /design path

Change-Id: I50e88501cec2a386054fcd5974b5cbfeb73325eb
es/assets/templates/designpage.cs
rc/com/google/doclava/DocFile.java
b7b8c93ae85e4516bb6e73235e6d007d2c382f77 01-Mar-2012 Tor Norbye <tnorbye@google.com> am b099bab4: (-s ours) Fix doclava to preserve annotations on fields and methods - do not merge.

* commit 'b099bab402ee11e80bc5d7e420540350afc4dfc0':
Fix doclava to preserve annotations on fields and methods - do not merge.
b099bab402ee11e80bc5d7e420540350afc4dfc0 29-Feb-2012 Tor Norbye <tnorbye@google.com> Fix doclava to preserve annotations on fields and methods - do not merge.

The android.jar stubs file used in the SDK was missing @Deprecated
annotations on methods and fields.

This changeset updates doclava to write annotations on methods and
fields as well, and to also add a @Deprecated annotation for APIs that
were marked deprecated but missing an annotation (presumably because
they only used the @deprecated doc comment; there are about 30 such
APIs out of 800+ deprecation usages.)

This fixes
http://code.google.com/p/android/issues/detail?id=26173

(cherry picked from commit 73934887ea87fca353449f0fd476d6c07b349521)

Change-Id: I7b78c481ed043df20ecdc4fc59515566b70ebbc1
ndroid-changes.txt
rc/com/google/doclava/Stubs.java
73934887ea87fca353449f0fd476d6c07b349521 29-Feb-2012 Tor Norbye <tnorbye@google.com> Fix doclava to preserve annotations on fields and methods

The android.jar stubs file used in the SDK was missing @Deprecated
annotations on methods and fields.

This changeset updates doclava to write annotations on methods and
fields as well, and to also add a @Deprecated annotation for APIs that
were marked deprecated but missing an annotation (presumably because
they only used the @deprecated doc comment; there are about 30 such
APIs out of 800+ deprecation usages.)

This fixes
http://code.google.com/p/android/issues/detail?id=26173

Change-Id: Iad675d4cfdf650165bfb7050cdcc0978c3a72d55
ndroid-changes.txt
rc/com/google/doclava/Stubs.java
75b3d82c5c842e4be8e7d932e9dd6314b5e3b809 02-Feb-2012 Scott Main <smain@google.com> am 73fc10a6: docs: add support for meta description in the doclava <head>; docs can optionally add a page.metaDescription definition to the document HDF data (above the @jd:body).

* commit '73fc10a67d65cd077e5ff5c4bb2d91f2208ab338':
docs: add support for meta description in the doclava <head>; docs can optionally add a page.metaDescription definition to the document HDF data (above the @jd:body).
73fc10a67d65cd077e5ff5c4bb2d91f2208ab338 01-Feb-2012 Scott Main <smain@google.com> docs: add support for meta description in the doclava <head>;
docs can optionally add a page.metaDescription definition to the document
HDF data (above the @jd:body).

Change-Id: I6e29f9b409e5c4adca5dfd7e78525f9752ca3bc9
es/assets/templates/head_tag.cs
4d257bb7e2c8b611520b807a653a0cc8a56c2206 31-Jan-2012 Scott Main <smain@google.com> am b7ec9068: docs: add meta data based on schema.org

* commit 'b7ec9068e31cb19e3ccf7ab09ae6c092af343e0d':
docs: add meta data based on schema.org
b7ec9068e31cb19e3ccf7ab09ae6c092af343e0d 30-Jan-2012 Scott Main <smain@google.com> docs: add meta data based on schema.org

Change-Id: Icacc1efc85b316278005121d049ec4476b6a0b24
es/assets/templates/class.cs
es/assets/templates/docpage.cs
526acab361c04de167811ad5772aca5ae2390ad3 12-Jan-2012 Scott Main <smain@google.com> am 1be4b152: doclava: don\'t print "since api level" string if there\'s no level available

* commit '1be4b1524f27696c9c71b78468742c162dd0b9c1':
doclava: don't print "since api level" string if there's no level available
1be4b1524f27696c9c71b78468742c162dd0b9c1 12-Jan-2012 Scott Main <smain@google.com> doclava: don't print "since api level" string if there's no level available

Change-Id: I20d3a61bcd73bdebcbefc7db3e57f213e04b5802
es/assets/templates/macros.cs
7efab0654228208ba605ffafc38b433a70e62933 16-Nov-2011 Ben Gruver <bgruv@google.com> Update the module name for the antlr runtime dependency

Change-Id: Ia1ddfb1401ee598926948e456342bc99d2dd7386
Signed-off-by: Ben Gruver <bgruv@google.com>
ndroid.mk
7ab64e63c47c4b13472f230d22265cd2cd50fef1 28-Sep-2011 Jesse Wilson <jessewilson@google.com> Fail loudly when there's an error parsing an API XML file.

We were previously using the same error code for a missing
version on a member (shouldn't be fatal) and a broken XML file
(should be fatal).

This makes the broken XML case fatal, and includes the reason
why.

Change-Id: Ia65d07544b8cb8ac95896cd451930ed37d69ee57
rc/com/google/doclava/Errors.java
rc/com/google/doclava/SinceTagger.java
c53bda660d09211b6505668091a17bbb28ee3237 13-Sep-2011 Scott Main <smain@google.com> Add training/ directory to path of docs to use the resources tab (using docpage.cs)

Change-Id: I50ea30d4447d25ff60b761e8be77065917cc686b
rc/com/google/doclava/DocFile.java
b407d0df0cbb36ea6040f4cb7c0b64f67c0bbdb1 28-Jul-2011 Scott Main <smain@google.com> docs: remove "since" info for xml attributes because we don't have it

Change-Id: I0d1a7a4b25956bb9b5c214c414cfa444f22ff8fd
es/assets/templates/class.cs
f959ed158599686910af990654d6c84d262868ff 23-Jun-2011 Andrew Sapperstein <asapperstein@google.com> Rewrote comment parsing to be much faster.

Now uses plain string parsing rather than regex to parse
the comments. Timing is both more accurate and lower
by about 40 percent on my machine.

Change-Id: I73a0bac3c49571dcb71b499b738966cde27c1c29
rc/com/google/doclava/ClearPage.java
rc/com/google/doclava/Comment.java
rc/com/google/doclava/ConstructorInfo.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/Doclava2.java
6ba612efffba42bec102ac58a1540496158f747e 21-Jun-2011 Andrew Sapperstein <asapperstein@google.com> Parsing entire tree and resolving all conflicts.

Unfortunately, this takes 3 passes (1 parse and 2 resolve passes)
due to one corner case (where you refer to something that is inside a superclass
that is in a different package). Fortunately, there are only
3 or 4 resolutions on the third pass.

Change-Id: I14dc6e61e002058132b8065a7b31abb87ac8f2a1
rc/com/google/doclava/AnnotationInstanceInfo.java
rc/com/google/doclava/AnnotationValueInfo.java
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/DocInfo.java
rc/com/google/doclava/Doclava2.java
rc/com/google/doclava/InfoBuilder.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/Resolution.java
rc/com/google/doclava/Resolvable.java
rc/com/google/doclava/TypeInfo.java
rc/com/google/doclava/parser/Java.g
rc/com/google/doclava/parser/JavaLexer.java
rc/com/google/doclava/parser/JavaParser.java
rc/com/google/doclava/parser/README.txt
d6eaacbb9eb56763d38a3815fc509b92ed98a585 20-May-2011 Andrew Sapperstein <asapperstein@google.com> Modified old doclava to use LinkedLists instead of arrays

Functioning java parsing as well. Needs to be wired up into doclava proper.

Change-Id: Ifa38ca7312e6c23a8f663a9d0638afb9a29bf19d
ndroid.mk
rc/com/google/doclava/AnnotationInstanceInfo.java
rc/com/google/doclava/AnnotationValueInfo.java
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Converter.java
rc/com/google/doclava/DocInfo.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/Doclava2.java
rc/com/google/doclava/FieldInfo.java
rc/com/google/doclava/InfoBuilder.java
rc/com/google/doclava/MemberInfo.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/PackageInfo.java
rc/com/google/doclava/Resolution.java
rc/com/google/doclava/Resolvable.java
rc/com/google/doclava/SinceTagger.java
rc/com/google/doclava/Stubs.java
rc/com/google/doclava/TypeInfo.java
rc/com/google/doclava/apicheck/ApiFile.java
rc/com/google/doclava/apicheck/XmlApiFile.java
rc/com/google/doclava/parser/Java.g
rc/com/google/doclava/parser/JavaLexer.java
rc/com/google/doclava/parser/JavaParser.java
rc/com/google/doclava/parser/README.txt
0a39f108bf5eb50d2b3640d98416a8e9b295fd9e 10-Jun-2011 Brian Carlstrom <bdc@google.com> Merge "Add some missing buffering to doclava file output"
ed8f79791885c3ac15401d88a147aee551e1039e 10-Jun-2011 Brian Carlstrom <bdc@google.com> Add some missing buffering to doclava file output

Change-Id: I21927fc742026eba93fa9205d107834a671d873d
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/DoclavaDiff.java
rc/com/google/doclava/Proofread.java
rc/com/google/doclava/Stubs.java
cd020c30a870477480261fbb1463afae4cddd42e 07-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4588827 synchronized keyword add/rm compatible

This only addresses the API check part, html output still has "synchronized".

Change-Id: I4df22215480776462b6113ad802d2b46b696a41c
rc/com/google/doclava/MethodInfo.java
132afe44b3b7963e47d4c32948b2667ddc00062c 01-Jun-2011 Joe Onorato <joeo@google.com> Put the enum constants into the api file.

Bug: 4292741
Change-Id: I87d298511984a7f99192015a3f81bce07c106692
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/Stubs.java
rc/com/google/doclava/apicheck/ApiCheck.java
rc/com/google/doclava/apicheck/ApiFile.java
040992567205c3b6e4ee01bfb2893bceb915357c 09-Mar-2011 Joe Onorato <joeo@google.com> Add support for new API file format.

Change-Id: I7db4d1559d24906365f447652d28c4b04a20805d
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/ConstructorInfo.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/FieldInfo.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/Stubs.java
rc/com/google/doclava/apicheck/ApiCheck.java
rc/com/google/doclava/apicheck/ApiFile.java
rc/com/google/doclava/apicheck/ApiParseException.java
rc/com/google/doclava/apicheck/XmlApiFile.java
5935135f7cffb7a730d978a8ea25ae5951a7f6ba 02-Mar-2011 Joe Onorato <joeo@google.com> Add an isDerivedFrom() that takes a class name, in addition to the one that takes a ClassInfo.

Change-Id: I053c7124d1076bde9d7dac118af05281d1a044c4
rc/com/google/doclava/ClassInfo.java
0aff7e0b51a6ad0423bcba8101e17797872a492e 01-Mar-2011 Joe Onorato <joeo@google.com> Separate the XML parsing out, to make it easier to add a more readable format.

Change-Id: Ief8fcb8595af5b28e5c22e15dd2cbaa735494ff1
rc/com/google/doclava/apicheck/ApiCheck.java
rc/com/google/doclava/apicheck/XmlApiFile.java
21b9c8136852230f5790d8d526a093127c90484e 03-Mar-2011 Jesse Wilson <jessewilson@google.com> am de539121: am ba2621ad: cherrypick Change-Id: I290b5b3000d685b0524a9e7131bd5ca19a63bbdf Always show enum constants.

* commit 'de539121659704144a7accbd0b59ab6dfbb66a36':
cherrypick Change-Id: I290b5b3000d685b0524a9e7131bd5ca19a63bbdf Always show enum constants.
de539121659704144a7accbd0b59ab6dfbb66a36 03-Mar-2011 Jesse Wilson <jessewilson@google.com> am ba2621ad: cherrypick Change-Id: I290b5b3000d685b0524a9e7131bd5ca19a63bbdf Always show enum constants.

* commit 'ba2621ade192f856bbcf1c93659aaf90c821179c':
cherrypick Change-Id: I290b5b3000d685b0524a9e7131bd5ca19a63bbdf Always show enum constants.
ba2621ade192f856bbcf1c93659aaf90c821179c 02-Mar-2011 Jesse Wilson <jessewilson@google.com> cherrypick Change-Id: I290b5b3000d685b0524a9e7131bd5ca19a63bbdf
Always show enum constants.

Enums were not identifying themselves as constants. This may be
caused by the upgrade to Java 6. All enum constants should be
shown; the check is unnecessary.

Change-Id: Ia36d406e1ce0c5ddef36681bbd2958fa69005893
http://code.google.com/p/android/issues/detail?id=15038
rc/com/google/doclava/ClassInfo.java
331b8a2511bb860ab6b96f159748c35a01080f65 02-Mar-2011 Jesse Wilson <jessewilson@google.com> Always show enum constants.

Enums were not identifying themselves as constants. This may be
caused by the upgrade to Java 6. All enum constants should be
shown; the check is unnecessary.

Change-Id: I290b5b3000d685b0524a9e7131bd5ca19a63bbdf
http://code.google.com/p/android/issues/detail?id=15038
rc/com/google/doclava/ClassInfo.java
26164702ecf7799ad4fd0c97478489f0f239d37d 15-Feb-2011 Scott Main <smain@google.com> am 6ebcdf21: Merge "docs: generate HTML for aidl and renderscript files" into honeycomb

* commit '6ebcdf21e03b5a5d7fde3f499701a3122c7b1530':
docs: generate HTML for aidl and renderscript files
6ebcdf21e03b5a5d7fde3f499701a3122c7b1530 15-Feb-2011 Scott Main <smain@google.com> Merge "docs: generate HTML for aidl and renderscript files" into honeycomb
4c50ab1d243bdc0391751d2e8f8b5f62ee7f251f 15-Feb-2011 Scott Main <smain@google.com> docs: generate HTML for aidl and renderscript files

Change-Id: Ie6801ab94625f99542a48c6b87ae62f6175ea865
rc/com/google/doclava/SampleCode.java
194d56e4315aeb226d7aa2a5812c3feda54f7dfa 15-Feb-2011 Scott Main <smain@google.com> am 887e6378: docs: fix sample index page back link (it\'s not always two levels above the home, so we\'ll just need the index page to redirect to the browser)

* commit '887e63781add33e6ffbfb5704090440d91696c28':
docs: fix sample index page back link (it's not always two levels above the home, so we'll just need the index page to redirect to the browser)
887e63781add33e6ffbfb5704090440d91696c28 14-Feb-2011 Scott Main <smain@google.com> docs: fix sample index page back link (it's not always two levels above the home,
so we'll just need the index page to redirect to the browser)

Change-Id: I336c1652037ca2463500297212a4a1c44561f297
es/assets/templates/sampleindex.cs
30f70f1bc068e3f88e1eed192f343e55c4369391 12-Feb-2011 Roman Nurik <romannurik@google.com> am ebf20991: Fix Back link for samples, SDK samples path reference

* commit 'ebf209917df1f255e2683db7ae39df95208291a0':
Fix Back link for samples, SDK samples path reference
ebf209917df1f255e2683db7ae39df95208291a0 11-Feb-2011 Roman Nurik <romannurik@google.com> Fix Back link for samples, SDK samples path reference

Change-Id: I7676db898adbf58df102936f957ca6f75d023776
es/assets/templates/sample.cs
es/assets/templates/sampleindex.cs
871e638c5a655616f03bd50f05d0a25e1f6879d4 26-Jan-2011 Scott Main <smain@google.com> am 4d505bf1: ok, really fix the stylesheet bug this time

* commit '4d505bf1fae392f3fb48bcaf62e9623d69724fa5':
ok, really fix the stylesheet bug this time
4d505bf1fae392f3fb48bcaf62e9623d69724fa5 26-Jan-2011 Scott Main <smain@google.com> ok, really fix the stylesheet bug this time

Change-Id: I0b040e74a731082f74ecb47c8a82f0288c81b3ab
rc/com/google/doclava/SampleCode.java
2057d865c69b749f4f0983349ea271845005df10 25-Jan-2011 Scott Main <smain@google.com> docs: don't use the sdkdoc template if the index file is for a preview

Change-Id: I9eda503776bb2dc4a72942c3b6ea30ab419c54a8
rc/com/google/doclava/DocFile.java
e27c950134c99151d1d9914eaaf28848327e4f63 19-Jan-2011 Scott Main <smain@google.com> fix bug that caused offline sample pages to not load styles.

Change-Id: Ibadb5123f3d51c2bc46e7a0d281c2ff7b4b6a059
rc/com/google/doclava/SampleCode.java
7692aa59501e53cd46efa2264dcb9e44c8199bae 17-Jan-2011 Scott Main <smain@google.com> docs: make sample docs browsable in offline docs

Change-Id: I543329007fd483133ccecc499cf2a6621e5a3ff0
es/assets/templates/sample.cs
es/assets/templates/sampleindex.cs
rc/com/google/doclava/SampleCode.java
62aaca829e5b443a3c1345c54c44293587929dd4 29-Nov-2010 Dan Bornstein <danfuzz@android.com> (static && final) isn't necessarily constant.

Change doclava to only recognize constants when they have a
constant value. See the comment in the change in re the possible
ambiguity.

Change-Id: I7453cadddd4ad72b28b71f06147658a41fe6abc3
rc/com/google/doclava/FieldInfo.java
ea3d8044f2460519118965036bff4fa2ef375722 23-Nov-2010 Scott Main <smain@google.com> docs: don't use sdk page template for features.html

Change-Id: I3e2ec7e8ca60c8278aea6296833ba82e590ae152
rc/com/google/doclava/DocFile.java
3c1a6b2a6d80f02fa5460d9d8de356be5508de29 16-Oct-2010 Scott Main <smain@google.com> show full package description in the package summary and remove the separate description page

Change-Id: Ib443473f54d768765041be0c969fa8b2f9637c57
es/assets/templates/assets/doclava-developer-docs.js
es/assets/templates/assets/style.css
es/assets/templates/package-descr.cs
es/assets/templates/package.cs
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/NavTree.java
rc/com/google/doclava/PackageInfo.java
225062aa35515a86890a103c563cda70712a4cc5 15-Oct-2010 Scott Main <smain@google.com> remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph

Change-Id: Ica6e19f1cce4d2495510b09eb5fa3b72fbe329bb
es/assets/templates/packages.cs
7a6456cec94b5d3107f36b61e9c9f303c68e9392 16-Sep-2010 Joe Onorato <joeo@google.com> Add a -knowntags option to doclava.

Change-Id: I1d2dae84d26084d92ca297eb2c0fc0b3d8afa76a
rc/com/google/doclava/Comment.java
rc/com/google/doclava/Doclava.java
41d8656cf17e04b25a058d0874e401654ea547b4 21-Aug-2010 Dirk Dougherty <ddougherty@google.com> Remove some sdk specific usages from css, js, and java files.

Change-Id: I63e6e3b7758124a208746fed771dbce9b5d45432
es/assets/templates/assets/android-developer-core.css
es/assets/templates/assets/android-developer-docs-devguide.css
es/assets/templates/assets/android-developer-docs.css
es/assets/templates/assets/android-developer-docs.js
es/assets/templates/assets/android-developer-reference.js
es/assets/templates/assets/doclava-developer-core.css
es/assets/templates/assets/doclava-developer-docs.css
es/assets/templates/assets/doclava-developer-docs.js
es/assets/templates/assets/doclava-developer-reference.js
es/assets/templates/assets/microtemplate.js
es/assets/templates/head_tag.cs
es/assets/templates/macros.cs
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/DoclavaDiff.java
rc/com/google/doclava/SinceTagger.java
4bac50adef51d339bb967369f9aca0de7f6c1b2f 26-Aug-2010 Bill Napier <napier@google.com> dd support for multiple html directories to doclava.

The goal for adding this support is to allow doclava to pull html
files both from the static content and from content generated at
build time.

Change-Id: I5d0db2c5868b93452c47cf69da93ca0a742e3400
rc/com/google/doclava/ClearPage.java
rc/com/google/doclava/Doclava.java
beef1457a4e56e88001bc68bd0d4742baf2adf18 14-Aug-2010 Ben Dodson <bjdodson@google.com> Fix for regression when adding/removing methods and constructors

Change-Id: I5e923abfc93de2c1623d4e56a4a939bd0bd88060
rc/com/google/doclava/MethodInfo.java
f22ba05c19de46e546ce9ae4783ac43e220e0425 12-Aug-2010 Ben Dodson <bjdodson@google.com> Canonicalize floating points to work around JVM issues

Change-Id: I4ac2ebd2ccd98b6bd00439c3f40016a15fdc6573
rc/com/google/doclava/FieldInfo.java
a6be5d02b53d17d6f4ee2bcb6f2189da7bfa37ef 11-Aug-2010 Ben Dodson <bjdodson@google.com> Fix for ellipsed subclasses

Change-Id: Ia27225adad4e5495bfea622781b3e750cb7cd237
es/assets/templates/macros.cs
297fb6d2c5d7b8127b29fdaf82a5bb0e87bba8f6 11-Aug-2010 Ben Dodson <bjdodson@google.com> Fix for overriding errors; removed Manifest, since classpath is required

Change-Id: I0ffa6b695a8280a1ef8416897df3c20aeb142b5e
ndroid.mk
rc/MANIFEST.mf
rc/com/google/doclava/AttributeInfo.java
rc/com/google/doclava/Errors.java
00a7d90c6a8f5e47567eca417414fe9a70811f8f 10-Aug-2010 Ben Dodson <bjdodson@google.com> Merge "Added script to sync from svn"
de17963a3dcb9273a04a5062c025b5f2dd73556c 10-Aug-2010 Ben Dodson <bjdodson@google.com> Added newline to Manifest

Change-Id: I38b7b2aab7d177eea90f4d87fac9d6e611cd0ca4
rc/MANIFEST.mf
9ccd9e3a9df835dc134e7edd2e4236220aed401e 07-Aug-2010 Ben Dodson <bjdodson@google.com> Added script to sync from svn

Change-Id: I23f41841e853764523dc414996128d65b16eefb6
OTICE
uild.xml
oe.sh
rc/com/google/doclava/Comment.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/Errors.java
rc/com/google/doclava/TypeInfo.java
920dbbbaca6aa578f3b26d89e99d12754c26ed60 05-Aug-2010 Ben Dodson <bjdodson@google.com> Initial import of Doclava project

Change-Id: Ia5ae56f1700fce98e0ae6954fa2df617ec0537bb
ndroid.mk
OTICE
uild.xml
es/assets/customizations/assets/customizations.css
es/assets/customizations/assets/customizations.js
es/assets/customizations/customizations.cs
es/assets/templates/assets/android-developer-core.css
es/assets/templates/assets/android-developer-docs-devguide.css
es/assets/templates/assets/android-developer-docs.css
es/assets/templates/assets/android-developer-docs.js
es/assets/templates/assets/android-developer-reference.js
es/assets/templates/assets/images/bg_fade.jpg
es/assets/templates/assets/images/bg_logo.png
es/assets/templates/assets/images/body-gradient-tab.png
es/assets/templates/assets/images/body-gradient.png
es/assets/templates/assets/images/grad-rule-qv.png
es/assets/templates/assets/images/hr_gray_main.jpg
es/assets/templates/assets/images/hr_gray_side.jpg
es/assets/templates/assets/images/left_off.jpg
es/assets/templates/assets/images/left_on.jpg
es/assets/templates/assets/images/preliminary.png
es/assets/templates/assets/images/resizable-e.gif
es/assets/templates/assets/images/resizable-e2.gif
es/assets/templates/assets/images/resizable-eg.gif
es/assets/templates/assets/images/resizable-s.gif
es/assets/templates/assets/images/resizable-s2.gif
es/assets/templates/assets/images/resizable-sg.gif
es/assets/templates/assets/images/right_off.jpg
es/assets/templates/assets/images/right_on.jpg
es/assets/templates/assets/images/sidenav-rule.png
es/assets/templates/assets/images/spacer.gif
es/assets/templates/assets/images/triangle-closed-small.png
es/assets/templates/assets/images/triangle-closed.png
es/assets/templates/assets/images/triangle-opened-small.png
es/assets/templates/assets/images/triangle-opened.png
es/assets/templates/assets/jquery-history.js
es/assets/templates/assets/jquery-resizable.min.js
es/assets/templates/assets/microtemplate.js
es/assets/templates/assets/prettify.js
es/assets/templates/assets/search_autocomplete.js
es/assets/templates/assets/style.css
es/assets/templates/assets/triangle-none.gif
es/assets/templates/class.cs
es/assets/templates/classes.cs
es/assets/templates/components.cs
es/assets/templates/components/api_filter.cs
es/assets/templates/components/left_nav.cs
es/assets/templates/components/masthead.cs
es/assets/templates/components/search_box.cs
es/assets/templates/data.hdf
es/assets/templates/diff.cs
es/assets/templates/docpage.cs
es/assets/templates/doctype.cs
es/assets/templates/footer.cs
es/assets/templates/head_tag.cs
es/assets/templates/header.cs
es/assets/templates/hierarchy.cs
es/assets/templates/index.cs
es/assets/templates/keywords.cs
es/assets/templates/lists.cs
es/assets/templates/macros.cs
es/assets/templates/navtree_data.cs
es/assets/templates/nosidenavpage.cs
es/assets/templates/package-descr.cs
es/assets/templates/package-list.cs
es/assets/templates/package.cs
es/assets/templates/packages.cs
es/assets/templates/sample.cs
es/assets/templates/sampleindex.cs
es/assets/templates/todo.cs
es/assets/templates/trailer.cs
rc/MANIFEST.mf
rc/com/google/doclava/AnnotationInstanceInfo.java
rc/com/google/doclava/AnnotationValueInfo.java
rc/com/google/doclava/AttrTagInfo.java
rc/com/google/doclava/AttributeInfo.java
rc/com/google/doclava/ClassInfo.java
rc/com/google/doclava/ClearPage.java
rc/com/google/doclava/CodeTagInfo.java
rc/com/google/doclava/Comment.java
rc/com/google/doclava/ConstructorInfo.java
rc/com/google/doclava/ContainerInfo.java
rc/com/google/doclava/Converter.java
rc/com/google/doclava/DocFile.java
rc/com/google/doclava/DocInfo.java
rc/com/google/doclava/Doclava.java
rc/com/google/doclava/DoclavaDiff.java
rc/com/google/doclava/Errors.java
rc/com/google/doclava/FederatedSite.java
rc/com/google/doclava/FederationTagger.java
rc/com/google/doclava/FieldInfo.java
rc/com/google/doclava/Hierarchy.java
rc/com/google/doclava/InheritedTags.java
rc/com/google/doclava/JarUtils.java
rc/com/google/doclava/KeywordEntry.java
rc/com/google/doclava/LinkReference.java
rc/com/google/doclava/LiteralTagInfo.java
rc/com/google/doclava/MemberInfo.java
rc/com/google/doclava/MethodInfo.java
rc/com/google/doclava/NavTree.java
rc/com/google/doclava/PackageInfo.java
rc/com/google/doclava/ParamTagInfo.java
rc/com/google/doclava/ParameterInfo.java
rc/com/google/doclava/ParsedTagInfo.java
rc/com/google/doclava/Proofread.java
rc/com/google/doclava/SampleCode.java
rc/com/google/doclava/SampleTagInfo.java
rc/com/google/doclava/Scoped.java
rc/com/google/doclava/SeeTagInfo.java
rc/com/google/doclava/SinceTagger.java
rc/com/google/doclava/Sorter.java
rc/com/google/doclava/SourcePositionInfo.java
rc/com/google/doclava/Stubs.java
rc/com/google/doclava/TagInfo.java
rc/com/google/doclava/TextTagInfo.java
rc/com/google/doclava/ThrowsTagInfo.java
rc/com/google/doclava/TodoFile.java
rc/com/google/doclava/TypeInfo.java
rc/com/google/doclava/apicheck/AbstractMethodInfo.java
rc/com/google/doclava/apicheck/ApiCheck.java
rc/com/google/doclava/apicheck/ApiInfo.java
rc/com/google/doclava/apicheck/ApiParseException.java
est/api/add-class.xml
est/api/added-exception.xml
est/api/added-field.xml
est/api/added-interface.xml
est/api/added-package.xml
est/api/api.xml
est/api/changed-abstract.xml
est/api/changed-abstract2.xml
est/api/changed-class-info.xml
est/api/changed-class-info2.xml
est/api/changed-deprecated.xml
est/api/changed-deprecated2.xml
est/api/changed-deprecated3.xml
est/api/changed-final.xml
est/api/changed-final2.xml
est/api/changed-final3.xml
est/api/changed-native.xml
est/api/changed-scope.xml
est/api/changed-scope2.xml
est/api/changed-scope3.xml
est/api/changed-scope4.xml
est/api/changed-static.xml
est/api/changed-static2.xml
est/api/changed-static3.xml
est/api/changed-super.xml
est/api/changed-synchronized.xml
est/api/changed-transient.xml
est/api/changed-type.xml
est/api/changed-value.xml
est/api/changed-value2.xml
est/api/changed-volatile.xml
est/api/constants.xml
est/api/medium.xml
est/api/parameter-changed-1.xml
est/api/parameter-changed-2.xml
est/api/parameter-changed-3.xml
est/api/removed-exception.xml
est/api/removed-interface.xml
est/api/return-type-changed-1.xml
est/api/return-type-changed-2.xml
est/api/simple.xml
est/api/throws.xml
est/doclava/ApiCheckTest.java
c8f6c750effdcfe65efc5a7d3bb62c4693cf4231 22-Jul-2010 Anatol Pomozov <anatol.pomozov@gmail.com> new project, first commit