Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev

Browse Source 
am: 6623f4177c

Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
This commit is contained in:
smain@google.com
2016-07-18 15:08:13 +00:00
committed by android-build-merger
parent edf16d6d4b 6623f4177c
commit 38b71c5741
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -895,7 +895,7 @@ framework_docs_SDK_REL_ID:=1
framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-hdf sdk.codename N \
-hdf sdk.preview.version 2 \
-hdf sdk.preview.version 5 \
-hdf sdk.version $(framework_docs_SDK_VERSION) \
-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \
-hdf sdk.preview 1

11
docs/docs-preview-index.html
View File

@@ -79,19 +79,16 @@ href="http://fonts.googleapis.com/css?family=Roboto+Condensed">
<h2>Get Started</h2>
<ul>
<li>View the <a href="reference/packages.html">API Reference</a></li>
<li>View the <a href="reference/packages.html">offline API Reference</a></li>
<li>Read Diff Reports:</a>
<ul>
<li><a href="sdk/api_diff/n-preview-1/changes.html"
>API 23 --> Preview 1</a></li>
<li><a href="https://developer.android.com/sdk/api_diff/24/changes.html"
>API 23 --> API 24</a></li>
</ul>
</li>
<li>Downloads and additional documentation are available at the
<li>For more information, visit the
<a href="http://developer.android.com/preview/index.html">
Android N Developer Preview site</a></li>
<li>For information about Developer Preview 1, visit the
<a href="http://developer.android.com/preview/support.html">Support</a>
page.</li>
</ul>