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

Commit 4405a232 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by The Android Open Source Project
Browse files

AI 150370: Add localized content infrastructure in droiddoc templates,... 

AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css.  DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
  BUG=1910893

Automated import of CL 150370
parent f9f41d0d

tools/droiddoc/src/ClearPage.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class ClearPage 
        OutputStreamWriter stream = null;

        try {

            stream = new OutputStreamWriter(

                            new FileOutputStream(file));

                            new FileOutputStream(file), "UTF-8");

            String rendered = cs.render();

            stream.write(rendered, 0, rendered.length());

        }

tools/droiddoc/src/DocFile.java

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ public class DocFile 
        try {

            File f = new File(filename);

            int length = (int)f.length();

            FileReader reader = new FileReader(f);

            FileInputStream is = new FileInputStream(f);

            InputStreamReader reader = new InputStreamReader(is, "UTF-8");

            char[] buf = new char[length];

            int index = 0;

            int amt;

tools/droiddoc/templates-sdk/customization.cs

+133 −36
Original line number Diff line number Diff line 
<?cs # This default template file is meant to be replaced. ?>

<?cs # Use the -tempatedir arg to javadoc to set your own directory with a replacement for this file in it. ?>





<?cs # The default search box that goes in the header ?><?cs 

def:default_search_box() ?>

  <div id="search" >

      <div id="searchForm">

          <form accept-charset="utf-8" class="gsc-search-box" 

                onsubmit="return submit_search()">

            <table class="gsc-search-box" cellpadding="0" cellspacing="0"><tbody>

                <tr>

                  <td class="gsc-input">

                    <input id="search_autocomplete" class="gsc-input" type="text" size="33" autocomplete="off"

                      title="search developer docs" name="q"

                      value="search developer docs"

                      onFocus="search_focus_changed(this, true)"

                      onBlur="search_focus_changed(this, false)"

                      onkeydown="return search_changed(event, true, '<?cs var:toroot?>')"

                      onkeyup="return search_changed(event, false, '<?cs var:toroot?>')" />

                  <div id="search_filtered_div" class="no-display">

                      <table id="search_filtered" cellspacing=0>

                      </table>

                  </div>

                  </td>

                  <td class="gsc-search-button">

                    <input type="submit" value="Search" title="search" id="search-button" class="gsc-search-button" />

                  </td>

                  <td class="gsc-clear-button">

                    <div title="clear results" class="gsc-clear-button">&nbsp;</div>

                  </td>

                </tr></tbody>

              </table>

          </form>

      </div><!-- searchForm -->

  </div><!-- search --><?cs 

/def ?>



<?cs 

def:custom_masthead() ?>

  <div id="header">

      <div id="headerLeft">

          <a href="<?cs var:toroot ?>index.html" tabindex="-1"><img

              src="<?cs var:toroot ?>assets/images/bg_logo.png" alt="Android Developers" /></a>

          <ul class="<?cs 

                  if:reference ?>reference<?cs

                  elif:guide ?>guide<?cs

                  elif:sdk ?>sdk<?cs

                  elif:home ?>home<?cs

                  elif:community ?>community<?cs

                  elif:publish ?>publish<?cs

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

              <li id="home-link"><a href="<?cs var:toroot ?><?cs 

                  if:android.whichdoc != "online" ?>offline.html<?cs 

                  else ?>index.html<?cs /if ?>">

                  <span>Home</span></a></li>

              <li id="sdk-link"><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html"><span>SDK</span></a></li>

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

                                  onClick="return loadLast('guide')"><span>Dev Guide</span></a></li>

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

                                  onClick="return loadLast('reference')"><span>Reference</span></a></li>

              <li><a href="http://android-developers.blogspot.com"><span>Blog</span></a></li>

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

          </ul>

          <?cs include:"header_tabs.cs" ?>     <?cs # The links are extracted so we can better manage localization ?>

      </div>

      <div id="headerRight">

          <div id="headerLinks">

            <!-- <img src="<?cs var:toroot ?>assets/images/icon_world.jpg" alt="" /> -->

            <span class="text">

              <!-- &nbsp;<a href="#">English</a> | -->

              <a href="http://www.android.com">Android.com</a>

          <?cs if:template.showLanguageMenu ?>

              <img src="<?cs var:toroot ?>assets/images/icon_world.jpg" alt="" /> 

              <span id="language">

             	<select name="language" onChange="changeLangPref(this.value, true)">

    			<option value="en">English&nbsp;&nbsp;&nbsp;</option>

    			<option value="ja">日本語</option>

    			<?cs # 

			<option value="de">Deutsch</option> 

    			<option value="es">Español</option>

    			<option value="fr">Français</option>

    			<option value="it">Italiano</option>

    			<option value="zh-CN">中文 (简体)</option>

    			<option value="zh-TW">中文 (繁體)</option>

			?>

             	</select>	

             	<script type="text/javascript">

             	  <!--  

                  loadLangPref();  

             	   //-->

             	</script>

             </span>

          <?cs /if ?>

          <a href="http://www.android.com">Android.com</a>

          </div><?cs 

          call:default_search_box() ?>

      </div><!-- headerRight -->

      <script type="text/javascript">

        <!--  

        changeTabLang(getLangPref());  

        //-->

      </script>

  </div><!-- header --><?cs 

/def ?><?cs # custom_masthead ?>

/def ?>



<?cs 

def:sdk_nav() ?>
@@ -66,22 +105,80 @@ def:guide_nav() ?> 
    </script>

<?cs /def ?>



<?cs 

def:publish_nav() ?>

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

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

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

        include:"../../../../frameworks/base/docs/html/publish/publish_toc.cs" ?>

<?cs # The default side navigation for the reference docs ?><?cs 

def:default_left_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="swapper">

        <div id="nav-panels">

          <div id="resize-packages-nav">

            <div id="packages-nav">

              <div id="index-links"><nobr>

                <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><br/>

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

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

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

            if:subcount(class.package) ?>

            <ul>

              <?cs call:list("Interfaces", class.package.interfaces) ?>

              <?cs call:list("Classes", class.package.classes) ?>

              <?cs call:list("Enums", class.package.enums) ?>

              <?cs call:list("Exceptions", class.package.exceptions) ?>

              <?cs call:list("Errors", class.package.errors) ?>

            </ul><?cs 

            elif:subcount(package) ?>

            <ul>

              <?cs call:class_link_list("Interfaces", package.interfaces) ?>

              <?cs call:class_link_list("Classes", package.classes) ?>

              <?cs call:class_link_list("Enums", package.enums) ?>

              <?cs call:class_link_list("Exceptions", package.exceptions) ?>

              <?cs call:class_link_list("Errors", package.errors) ?>

            </ul><?cs 

            else ?>

              <script>

                /*addLoadEvent(maxPackageHeight);*/

              </script>

              <p style="padding:10px">Select a package to view its members</p><?cs 

            /if ?><br/>

          </div><!-- end classes -->

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

        <div id="nav-tree" style="display:none">

          <div id="index-links"><nobr>

            <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>

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

      </div><!-- end swapper -->

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

<?cs /def ?>

    <script>

      if (!isMobile) {

        $("<a href='#' id='nav-swap' onclick='swapNav();return false;' style='font-size:10px;line-height:9px;margin-left:1em;text-decoration:none;'><span id='tree-link'>Use Tree Navigation</span><span id='panel-link' style='display:none'>Use Panel Navigation</span></a>").appendTo("#side-nav");

        chooseDefaultNav();

        if ($("#nav-tree").is(':visible')) init_navtree("nav-tree", "<?cs var:toroot ?>", NAVTREE_DATA);

        else {

          addLoadEvent(function() {

            scrollIntoView("packages-nav");

            scrollIntoView("classes-nav");

          });

        }

        $("#swapper").css({borderBottom:"2px solid #aaa"});

      } else {

        swapNav(); // tree view should be used on mobile

      }

    </script><?cs 

/def ?>



<?cs 

def:custom_left_nav() ?><?cs 

  if:guide ?><?cs 

    call:guide_nav() ?><?cs 

  elif:publish ?><?cs 

    call:publish_nav() ?><?cs 

  elif:sdk ?><?cs 

    call:sdk_nav() ?><?cs 

  else ?><?cs

tools/droiddoc/templates-sdk/header_tabs.cs

0 → 100644
+55 −0
Original line number Diff line number Diff line 
<ul id="header-tabs" class="<?cs 

	if:reference ?>reference<?cs

	elif:guide ?>guide<?cs

	elif:sdk ?>sdk<?cs

	elif:home ?>home<?cs

	elif:community ?>community<?cs

	elif:publish ?>publish<?cs

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

         

	<li id="home-link"><a href="<?cs var:toroot ?><?cs if:android.whichdoc != "online" ?>offline.html<?cs else ?>index.html<?cs /if ?>">

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

		<span class="de">Startseite</span>

                <span class="ja">ホーム</span>

		<span class="zh-CN">主页</span>

		<span class="zh-TW">首頁</span>

	</a></li>

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

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

	</a></li>

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

		<span class="en">Dev Guide</span>

		<span class="de">Handbuch</span>

		<span class="es">Guía</span>

		<span class="fr">Guide</span>

		<span class="it">Guida</span>

                <span class="ja">開発ガイド</span>

		<span class="zh-CN">开发人员指南</span>

		<span class="zh-TW">開發指南</span>

	</a></li>

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

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

		<span class="de">Referenz</span>

		<span class="es">Referencia</span>

		<span class="fr">Référence</span>

		<span class="it">Riferimento</span>

                <span class="ja">リファレンス</span>

		<span class="zh-CN">参考</span>

		<span class="zh-TW">參考資料</span>

	</a></li>

	<li><a href="http://android-developers.blogspot.com">

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

                <span class="ja">ブログ</span>

		<span class="zh-CN">博客</span>

		<span class="zh-TW">網誌</span>

	</a></li>

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

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

		<span class="es">Comunidad</span>

		<span class="fr">Communauté</span>

                <span class="ja">コミュニティ</span>

		<span class="zh-CN">社区</span>

		<span class="zh-TW">社群</span>

	</a></li>

     

</ul>
 
 No newline at end of file

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

+12 −8
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ hr.blue { 
  top:7px;

}



#header li a span+span {

  display:none;

}



/* TAB HIGHLIGHTING */

.home #home-link a,

.publish #publish-link a,
@@ -268,20 +272,20 @@ hr.blue { 
#headerLinks {

  margin:10px 10px 0 0;

  height:13px;

}



#headerLinks .text {

  text-decoration: none;

  color: #7FA9B5;

  font-size: 11px;

  vertical-align: top;

}



#headerLinks a {

  text-decoration: underline;

  color: #7FA9B5;

  font-size: 11px;

  vertical-align: top;

}



#headerLinks img {

  vertical-align:middle;

}



#language {

  margin:0 10px 0 4px;

}



#search {