diff --git a/tools/droiddoc/templates-sdk-dev/components/masthead.cs b/tools/droiddoc/templates-sdk-dev/components/masthead.cs index e92d41d82..c1e270674 100644 --- a/tools/droiddoc/templates-sdk-dev/components/masthead.cs +++ b/tools/droiddoc/templates-sdk-dev/components/masthead.cs @@ -88,12 +88,12 @@ Developer Console - + - - - + # ADD SEARCH AND MENU ?> @@ -275,12 +275,11 @@ +/def ?> - -
@@ -290,6 +289,5 @@
-?> - - +?> \ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/customizations.cs b/tools/droiddoc/templates-sdk-dev/customizations.cs index 44ae239c5..a747d3f0d 100644 --- a/tools/droiddoc/templates-sdk-dev/customizations.cs +++ b/tools/droiddoc/templates-sdk-dev/customizations.cs @@ -1,14 +1,14 @@
- + +def:fullpage() ?>
- + - +# The default side navigation for the reference docs ?>
- +
@@ -91,9 +90,9 @@ elif:samples ?>
- + +def:header_search_widget() ?>
- + +def:search_results() ?>
@@ -148,9 +147,9 @@ elif:samples ?>
- + +def:custom_left_nav() ?> Back @@ -209,37 +208,37 @@ elif:samples ?>
- + - +# appears at the bottom of every page ?> Except as noted, this content is licensed under Creative Commons Attribution 2.5. For details and restrictions, see the Content License. - + +def:custom_copyright() ?> Except as noted, this content is licensed under Apache 2.0. For details and restrictions, see the Content License. - + +def:custom_footerlinks() ?> About Android Auto TV Wear Legal - + - +# appears on the right side of the blue bar at the bottom off every page ?> Android  r - + \ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/docpage.cs b/tools/droiddoc/templates-sdk-dev/docpage.cs index 0f1d4e054..e8a5ba3fe 100644 --- a/tools/droiddoc/templates-sdk-dev/docpage.cs +++ b/tools/droiddoc/templates-sdk-dev/docpage.cs @@ -1,10 +1,10 @@ - - - devsite> + devsite> - google ndk preview trainingcourse" itemscope itemtype="http://schema.org/Article"> + /if ?>" itemscope itemtype="http://schema.org/Article">> - - - ?> - +
?>
- + +elif:samplesProjectIndex ?>

- - - +
@@ -139,8 +140,8 @@ include:"header.cs" ?>
- -
+
    elements added here with javascript ?>
@@ -157,30 +158,32 @@ include:"header.cs" ?>
  • -
    - - - +
    - -
    - -
    - - +if devsite ?> +
    + +
    +# THIS IS THE MAIN DOC CONTENT ?>
    -
    - - +
    @@ -192,19 +195,22 @@ include:"header.cs" ?>

    -

    - +

    -
    - -
    - - +
    +
    - -
    + + - - + + - - +if:!devsite ?> + diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs index bc98bd077..64e8e7e17 100644 --- a/tools/droiddoc/templates-sdk-dev/head_tag.cs +++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs @@ -1,9 +1,19 @@ - - - - - + - - - - - + + - - - + + elif:design ?>/design/_project.yaml" /> - - + if:page.tags && page.tags != "" ?> + + + + + + - - - - - - - - - - - - - - - - - - - - - @@ -168,25 +168,11 @@ +# END if/else !devsite ?>Android Developers | Android Developers - - - - + http: - - + \ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/header.cs b/tools/droiddoc/templates-sdk-dev/header.cs index 8c671384e..a9273937f 100644 --- a/tools/droiddoc/templates-sdk-dev/header.cs +++ b/tools/droiddoc/templates-sdk-dev/header.cs @@ -8,4 +8,4 @@ - + \ No newline at end of file