Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df09424f authored by Scott Main's avatar Scott Main
Browse files

Patch 2: some fixes to the developer-docs stylesheet.... 

Patch 3: add "Since:" to the api level info
Patch 4: fix packages page and styles to reveal class summary

Squashed commit of the following:

commit 8fcdcb8dcbe9b93688f5eb1020654848d3242675
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 2423b30ee46c12f92051c4f2a096532e55752c46
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.

commit efd94b33071070f0dfc2045131b81cbdfe078468
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 3fb79313232c993f700ee90a94f59dcca275fb0b
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.
parent 882bbe14

tools/droiddoc/src/DroidDoc.java

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ public class DroidDoc 
            data.setValue("reference", "true");

            data.setValue("docs.packages." + i + ".name", s);

            data.setValue("docs.packages." + i + ".link", pkg.htmlPage());

            data.setValue("docs.packages." + i + ".since", pkg.getSince());

            TagInfo.makeHDF(data, "docs.packages." + i + ".shortDescr",

                                               pkg.firstSentenceTags());

            i++;

tools/droiddoc/src/PackageInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ public class PackageInfo extends DocInfo implements ContainerInfo 
            data.setValue(base + ".link", htmlPage());

        }

        data.setValue(base + ".name", name());

        data.setValue(base + ".since", getSince());

    }



    public void makeClassLinkListHDF(HDF data, String base)

tools/droiddoc/src/TypeInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ public class TypeInfo 
        }

        else if (!isPrimitive() && cl != null && cl.isIncluded()) {

            data.setValue(base + ".link", cl.htmlPage());

            data.setValue(base + ".since", cl.getSince());

        }



        if (mIsTypeVariable) {

tools/droiddoc/templates-sdk/customization.cs

+2 −4
Original line number Diff line number Diff line
@@ -117,10 +117,8 @@ def:default_left_nav() ?> 
                <a href="<?cs var:toroot ?>reference/packages.html" <?cs if:(page.title == "Package Index") ?>class="selected"<?cs /if ?> >Package Index</a> | 

                <a href="<?cs var:toroot ?>reference/classes.html" <?cs if:(page.title == "Class Index") ?>class="selected"<?cs /if ?>>Class Index</a></nobr>

              </div>

              <ul><?cs 

              each:pkg=docs.packages ?>

                <li <?cs if:(class.package.name == pkg.name) || (package.name == pkg.name)?>class="selected"<?cs /if ?>><?cs call:package_link(pkg) ?></li><?cs 

              /each ?>

              <ul>

              	<?cs call:package_link_list(docs.packages) ?>

              </ul><br/>

            </div> <!-- end packages -->

          </div> <!-- end resize-packages -->

tools/droiddoc/templates/assets/android-developer-core.css

+6 −3
Original line number Diff line number Diff line
@@ -49,8 +49,12 @@ a:visited code { 


input, select,

textarea, option {

  font-family:inherit;

  font-size:inherit;

  padding:0;

  margin:0;

}



option {

  padding:0 4px;

}



p {
@@ -692,7 +696,6 @@ td.gsc-search-button { 
#search-button {

  margin:0 0 0 2px;

  font-size:11px;

  height:1.8em;

}



/* search result tabs */