summaryrefslogtreecommitdiffstats
path: root/docs/html/preview
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-07-09 06:56:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-09 06:56:51 +0000
commit8cb9fd846fe2337d56bd9c42fe8fc1586d107875 (patch)
tree05e07ae399465e184bd2be36e557718507e6ac57 /docs/html/preview
parent872c24828ff9e69e2197ea42f72d7537246d0d46 (diff)
parent6051cd3e1b38b9c5b18392ce8c440aaf16412f66 (diff)
downloadframeworks_base-8cb9fd846fe2337d56bd9c42fe8fc1586d107875.zip
frameworks_base-8cb9fd846fe2337d56bd9c42fe8fc1586d107875.tar.gz
frameworks_base-8cb9fd846fe2337d56bd9c42fe8fc1586d107875.tar.bz2
am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.
* commit '6051cd3e1b38b9c5b18392ce8c440aaf16412f66': Docs: Changes to the "Support" preview page.
Diffstat (limited to 'docs/html/preview')
-rw-r--r--docs/html/preview/preview_toc.cs9
-rw-r--r--docs/html/preview/support.jd22
2 files changed, 13 insertions, 18 deletions
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
index 6cd4157..5cc2159 100644
--- a/docs/html/preview/preview_toc.cs
+++ b/docs/html/preview/preview_toc.cs
@@ -125,14 +125,7 @@
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html"
- es-lang="Soporte"
- ja-lang="サポート"
- ko-lang="지원"
- pt-br-lang="Suporte"
- ru-lang="Поддержка"
- zh-cn-lang="支持"
- zh-tw-lang="支援">
+ <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html">
Support</a></div>
</li>
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 954ca65..9922eda 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -52,11 +52,11 @@ page.image=images/cards/card-support_16-9_2x.png
<div class="wrap">
<div class="cols">
- <div class="col-5of12">
+ <div class="col-9of16">
<p>
<em>Date: July 2015<br>
- Build: MPZ79M<br>
- Hardware support: Nexus 5,6,9, Player<br>
+ Builds: MPZ79M (Nexus 5, 6, 9), MPZ79N (Nexus Player)<br>
+ Hardware support: Nexus 5, 6, 9, Player<br>
Emulator support: x86 &amp; ARM 32/64-bit<br>
Google Play services: 7.6</em>
</p>
@@ -293,10 +293,12 @@ page.image=images/cards/card-support_16-9_2x.png
</p>
<p>
- If you are just getting started with Android M Developer Preview you want to
- receive Developer Preview 2 by OTA, first download Developer Preview 1 and
- flash it to your device. Leave the device powered on for several hours until
- the device is registered and receives the update.
+ If you are just getting started with Android M Developer Preview, and want
+ to receive Developer Preview 2 via OTA, download the appropriate
+ Developer Preview 1 <a href="{@docRoot}preview/download_mp1.html#images">
+ system image</a>, and flash it to your device. Then,
+ leave the device powered on for several hours. It registers with the
+ OTA service, and receives Developer Preview 2 by OTA.
</p>
<p>
@@ -307,7 +309,7 @@ page.image=images/cards/card-support_16-9_2x.png
<p>
For instructions on how to start developing and testing with Android M, read
- <a href="/preview/setup-sdk.html">Setting up the SDK</a>
+ <a href="/preview/setup-sdk.html">Setting up the SDK</a>.
</p>
<h2 id="preview1-notes">
@@ -316,11 +318,11 @@ page.image=images/cards/card-support_16-9_2x.png
<div class="wrap">
<div class="cols">
- <div class="col-5of12">
+ <div class="col-6of12">
<p>
<em>Date: May 2015<br>
Build: MPZ44Q<br>
- Hardware support: Nexus 5,6,9, Player<br>
+ Hardware support: Nexus 5, 6, 9, Player<br>
Emulator support: x86 &amp; ARM (32/64-bit)<br>
Google Play services: 7.5</em>
</p>