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
diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs
index 9ec1f44..ba0e0f6 100644
--- a/tools/droiddoc/templates-sdk/customization.cs
+++ b/tools/droiddoc/templates-sdk/customization.cs
@@ -11,12 +11,12 @@
<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"
+ <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?>')"
+ 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>
@@ -46,19 +46,29 @@
</div>
<div id="headerRight">
<div id="headerLinks">
- <!-- <img src="<?cs var:toroot ?>assets/images/icon_world.jpg" alt="" /> -->
+ <?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)">
- <option value="en">English</option>
- <!-- <option value="ja"></option> -->
- </select>
- <script type="text/javascript">
- <!--
- loadLangPref();
- //-->
- </script>
- </span>
- <a href="http://www.android.com">Android.com</a>
+ <select name="language" onChange="changeLangPref(this.value, true)">
+ <option value="en">English </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 -->
@@ -151,9 +161,8 @@
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_default_navtree("<?cs var:toroot ?>");
- } else {
+ if ($("#nav-tree").is(':visible')) init_navtree("nav-tree", "<?cs var:toroot ?>", NAVTREE_DATA);
+ else {
addLoadEvent(function() {
scrollIntoView("packages-nav");
scrollIntoView("classes-nav");