summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe Fernandez <joefernandez@google.com> 2016-06-15 04:04:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-15 04:04:42 +0000
commit7c79f1663cbe52be5d27ef1d9fcb40f9f82a86e3 (patch)
tree1c979544b6f80a534873b03c3b095b98d23b810f
parentab62c65da95c6fe880896f2b20222ba4b328b483 (diff)
parent778047db7989406153270fd3fa2241d02c93e903 (diff)
Merge "docs: Updates for DP4 release" into nyc-dev
-rw-r--r--docs/html/index.jd1
-rw-r--r--docs/html/preview/index.jd1
-rw-r--r--docs/html/preview/overview.jd18
3 files changed, 12 insertions, 8 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index c69acabb10c6..b1248afa799e 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -22,6 +22,7 @@ nonavpage=true
<a href="{@docRoot}preview/index.html">
<h1 class="dac-hero-title">Android N Developer Preview</h1>
<p class="dac-hero-description">
+ <strong>Android N final SDK is now available!</strong>
Get ready for the next version of Android!
<strong>Test your apps</strong> on Nexus and other devices. Support new system
behaviors to <strong>save power and memory</strong>.
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 0b21e68cd855..241a98e737a0 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -24,6 +24,7 @@ footer.hide=1
<div class="col-7of16 col-push-9of16" style="padding-left:2em">
<h1 class="dac-hero-title">Android N Developer Preview</h1>
<p class="dac-hero-description">
+ <strong>Android N final SDK is now available!</strong>
Get ready for Android N!
<strong>Test your apps</strong> on Nexus and other devices. Support new system
behaviors to <strong>save power and memory</strong>.
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
index 1b45c1a66114..faf48b8685fa 100644
--- a/docs/html/preview/overview.jd
+++ b/docs/html/preview/overview.jd
@@ -5,25 +5,26 @@ meta.tags="preview", "developer", "android"
page.tags="preview", "developer", "android"
@jd:body
+
<!--
<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
+"background-color:#B2DFDB; padding: 5px 0;margin-bottom:1em; text-align:center;">
<h3>
- Developer Preview 3 is now available
+ Developer Preview X is now available
</h3>
- <p>Includes final SDK and near-final system images</p>
+ <p>This release includes the ...</p>
<div style="margin:auto 1em">
<ul class="dac-section-links">
<li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
+ <a href="{@docRoot}preview/support.html#dp4">
<span class="dac-sprite dac-auto-chevron"></span>
Read the Notes</a>
</li>
<li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
+ <a href="{@docRoot}preview/download.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
+ Test the Update</a>
</li>
<li class="dac-section-link">
@@ -137,13 +138,14 @@ page.tags="preview", "developer", "android"
-->
<h2 id="timeline">Timeline and updates</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
<p>
The N Developer Preview runs from 9 March 2016 until the final Android N
public release to AOSP and OEMs, planned for Q3 2016.
</p>
+<img src="{@docRoot}images/n-preview-updates_2x.png">
+
<p>
At key development milestones, we’ll deliver updates for your development and
testing environment. In general you can expect an update each month (4 to 6
@@ -154,7 +156,7 @@ page.tags="preview", "developer", "android"
<li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (initial release, alpha)</li>
<li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (incremental update, alpha)</li>
<li><strong><a href="{@docRoot}preview/support.html#dp3">Preview 3</a></strong> (incremental update, beta)</li>
- <li><strong>Preview 4</strong> (final APIs and official SDK, Play publishing)</li>
+ <li><strong><a href="{@docRoot}preview/support.html#dp4">Preview 4</a></strong> (final APIs and official SDK, Play publishing)</li>
<li><strong>Preview 5</strong> (near-final system images for final testing)</li>
<li><strong>Final release</strong> to AOSP and ecosystem</li>
</ul>