Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs
This commit is contained in:
Dirk Dougherty
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
acca12faea
@@ -832,7 +832,7 @@ LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
|
|||||||
LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
|
LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
|
||||||
LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
|
LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
|
LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
|
||||||
LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /intl/
|
LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /
|
||||||
|
|
||||||
LOCAL_MODULE := online-sdk
|
LOCAL_MODULE := online-sdk
|
||||||
|
|
||||||
@@ -859,7 +859,7 @@ LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
|
|||||||
LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
|
LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
|
LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
|
||||||
# specify a second html input dir and an output path relative to OUT_DIR)
|
# specify a second html input dir and an output path relative to OUT_DIR)
|
||||||
LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /
|
LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /
|
||||||
|
|
||||||
LOCAL_MODULE := ds
|
LOCAL_MODULE := ds
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
fullpage=true
|
fullpage=true
|
||||||
page.title=Google I/O 13
|
page.title=Google I/O 13
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ page.title=Develop
|
|||||||
header.hide=1
|
header.hide=1
|
||||||
carousel=1
|
carousel=1
|
||||||
tabbedList=1
|
tabbedList=1
|
||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
fullpage=true
|
fullpage=true
|
||||||
no_footer_links=true
|
no_footer_links=true
|
||||||
carousel=true
|
carousel=true
|
||||||
|
excludeFromSuggestions=true
|
||||||
page.metaDescription=The official site for Android developers. Provides the Android SDK and documentation for app developers and designers.
|
page.metaDescription=The official site for Android developers. Provides the Android SDK and documentation for app developers and designers.
|
||||||
page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" />
|
page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" />
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
page.title=Content License
|
page.title=Content License
|
||||||
fullpage=1
|
fullpage=1
|
||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<div class="wrap" style="width:940px;">
|
<div class="wrap" style="width:940px;">
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
home=true
|
home=true
|
||||||
page.title=Welcome
|
page.title=Welcome
|
||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
page.title=Developer Support
|
page.title=Developer Support
|
||||||
fullpage=1
|
fullpage=1
|
||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<div class="wrap" style="width:940px;">
|
<div class="wrap" style="width:940px;">
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
sdk.redirect=true
|
sdk.redirect=true
|
||||||
page.template=sdk
|
page.template=sdk
|
||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
page.title=Notepad Tutorial
|
page.title=Notepad Tutorial
|
||||||
parent.title=Tutorials
|
parent.title=Tutorials
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
page.title=Notepad Exercise 1
|
page.title=Notepad Exercise 1
|
||||||
parent.title=Notepad Tutorial
|
parent.title=Notepad Tutorial
|
||||||
parent.link=index.html
|
parent.link=index.html
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
Rpage.title=Notepad Exercise 2
|
excludeFromSuggestions=true
|
||||||
|
page.title=Notepad Exercise 2
|
||||||
parent.title=Notepad Tutorial
|
parent.title=Notepad Tutorial
|
||||||
parent.link=index.html
|
parent.link=index.html
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
page.title=Notepad Exercise 3
|
page.title=Notepad Exercise 3
|
||||||
parent.title=Notepad Tutorial
|
parent.title=Notepad Tutorial
|
||||||
parent.link=index.html
|
parent.link=index.html
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
page.title=Notepad Extra Credit
|
page.title=Notepad Extra Credit
|
||||||
parent.title=Notepad Tutorial
|
parent.title=Notepad Tutorial
|
||||||
parent.link=index.html
|
parent.link=index.html
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
excludeFromSuggestions=true
|
||||||
page.title=Notepad Tutorial
|
page.title=Notepad Tutorial
|
||||||
@jd:body
|
@jd:body
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user