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

Commit 7b0e85e1 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates... 

am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.

Merge commit '502c498f' into eclair-plus-aosp

* commit '502c498f':
  sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
parents 8625adde 502c498f

tools/droiddoc/src/DocFile.java

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,9 @@ public class DocFile 
            } else if (outfile.indexOf("guide/") != -1) {

                hdf.setValue("guide", "true");

                ClearPage.write(hdf, "docpage.cs", outfile);

            } else if (outfile.indexOf("resources/") != -1) {

                hdf.setValue("resources", "true");

                ClearPage.write(hdf, "resourcespage.cs", outfile);

            } else {

                ClearPage.write(hdf, "nosidenavpage.cs", outfile);

            }

tools/droiddoc/src/SampleCode.java

+4 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class SampleCode { 
            System.out.println("-samplecode not a directory: " + mSource);

            return;

        }

        if (offlineMode) writeIndexOnly(f, mDest);

        if (offlineMode) writeIndexOnly(f, mDest, offlineMode);

        else writeDirectory(f, mDest);

    }
@@ -118,9 +118,10 @@ public class SampleCode { 
        ClearPage.write(hdf, "sampleindex.cs", relative + "/index" + DroidDoc.htmlExtension);

    }



    public void writeIndexOnly(File dir, String relative) {

    public void writeIndexOnly(File dir, String relative, Boolean offline) {

        HDF hdf = writeIndex(dir);

        ClearPage.write(hdf, "sampleindex.cs", relative + "/index" +

        if (!offline) relative = "/" + relative;

        ClearPage.write(hdf, "sampleindex.cs", relative + "index" +

                        DroidDoc.htmlExtension);

    }

tools/droiddoc/templates-sdk/customization.cs

+17 −0
Original line number Diff line number Diff line
@@ -108,6 +108,21 @@ def:sdk_nav() ?> 
    </div> <!-- end side-nav -->

<?cs /def ?>



<?cs 

def:resources_tab_nav() ?>

  <div class="g-section g-tpl-240" id="body-content">

    <div class="g-unit g-first side-nav-resizable" id="side-nav">

      <div id="devdoc-nav"><?cs 

        include:"../../../../frameworks/base/docs/html/resources/resources_toc.cs" ?>

      </div>

    </div> <!-- end side-nav -->

    <script>

      addLoadEvent(function() {

        scrollIntoView("devdoc-nav");

        });

    </script>

<?cs /def ?>



<?cs 

def:guide_nav() ?>

  <div class="g-section g-tpl-240" id="body-content">
@@ -196,6 +211,8 @@ def:default_left_nav() ?> 
def:custom_left_nav() ?><?cs 

  if:guide ?><?cs 

    call:guide_nav() ?><?cs 

  elif:resources ?><?cs 

    call:resources_tab_nav() ?><?cs 

  elif:sdk ?><?cs 

    call:sdk_nav() ?><?cs 

  else ?><?cs

tools/droiddoc/templates-sdk/header_tabs.cs

+19 −17
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
	elif:guide ?>guide<?cs

	elif:sdk ?>sdk<?cs

	elif:home ?>home<?cs

	elif:community ?>community<?cs

	elif:resources ?>resources<?cs

	elif:videos ?>videos<?cs /if ?>">

    

	<li id="home-link"><a href="<?cs var:toroot ?><?cs
@@ -47,16 +47,16 @@ 
		<span style="display:none" class="zh-TW">參考資料</span>

	<?cs /if ?>

	</a></li>

	<li><a href="http://android-developers.blogspot.com" onClick="return requestAppendHL(this.href)">

	<li id="resources-link"><a href="<?cs var:toroot ?>resources/index.html" onClick="return loadLast('resources')">

	<?cs if:!sdk.redirect ?>

		<span class="en">Blog</span>

		<span class="en">Resources</span>

		<span style="display:none" class="de"></span>

		<span style="display:none" class="es"></span>

		<span style="display:none" class="fr"></span>

		<span style="display:none" class="it"></span>

    <span style="display:none" class="ja">ブログ</span>

		<span style="display:none" class="zh-CN">博客</span>

		<span style="display:none" class="zh-TW">網誌</span>

    		<span style="display:none" class="ja"></span>

		<span style="display:none" class="zh-CN"></span>

		<span style="display:none" class="zh-TW"></span>

	<?cs /if ?>

	</a></li>

	<li id="videos-link"><a href="<?cs var:toroot ?>videos/index.html" onClick="return loadLast('videos')">
@@ -71,17 +71,19 @@ 
		<span style="display:none" class="zh-TW"></span>

	<?cs /if ?>

	</a></li>

	<li id="community-link"><a href="<?cs var:toroot ?>community/index.html">

	<li><a href="http://android-developers.blogspot.com" onClick="return requestAppendHL(this.href)">

	<?cs if:!sdk.redirect ?>

		<span class="en">Community</span>

		<span class="en">Blog</span>

		<span style="display:none" class="de"></span>

		<span style="display:none" class="es">Comunidad</span>

		<span style="display:none" class="fr">Communauté</span>

		<span style="display:none" class="es"></span>

		<span style="display:none" class="fr"></span>

		<span style="display:none" class="it"></span>

    <span style="display:none" class="ja">コミュニティ</span>

		<span style="display:none" class="zh-CN">社区</span>

		<span style="display:none" class="zh-TW">社群</span>

		<span style="display:none" class="ja">ブログ</span>

		<span style="display:none" class="zh-CN">博客</span>

		<span style="display:none" class="zh-TW">網誌</span>

	<?cs /if ?>

	</a></li>





     

</ul>

tools/droiddoc/templates-sdk/resourcespage.cs

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?cs include:"doctype.cs" ?>

<?cs include:"macros.cs" ?>



<html>

<?cs include:"head_tag.cs" ?>



<body class="gc-documentation">

<?cs call:custom_masthead() ?>

<?cs call:resources_tab_nav() ?>

<a name="top"></a>

<div class="g-unit" id="doc-content" >

  <div id="jd-header" class="guide-header">

    <span class="crumb">&nbsp;</span>

    <h1><?cs var:page.title ?></h1>

  </div>



  <div id="jd-content">



    <?cs call:tag_list(root.descr) ?>



<?cs include:"footer.cs" ?>



</div><!-- end doc-content -->



<?cs include:"trailer.cs" ?>



</body>

</html>