am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev (619bbdf4) · Commits · e / os / android_frameworks_base

docs/html/index.jd

+13 −14

Original line number	Diff line number	Diff line
		@@ -10,32 +10,31 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
		<section class="dac-hero-carousel">

		<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
		<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
		<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
		<a href="/preview/index.html">
		<div class="wrap" style="max-width:1100px;">
		<div class="wrap" style="max-width:1100px;margin-top:0">
		<div class="cols dac-hero-content">
		<div class="col-10of16 col-push-6of16 dac-hero-figure">
		<img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
		srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
		{@docRoot}images/home/devices-hero_620px_2x.png 2x">
		<div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
		</div>
		<div class="col-6of16 col-pull-10of16">
		<div class="col-8of16 col-pull-7of16">
		<div class="dac-hero-tag"></div>

		<h1 class="dac-hero-title">Android M Developer Preview</h1>
		<p class="dac-hero-description">Get your apps ready for the next version
		<h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
		</div>
		<div class="col-6of16 col-push-1of16">
		<p class="dac-hero-description"><strong>Final SDK is now available!</strong> Get your apps ready for the next version
		of Android. Test on Nexus 5, 6, 9, and Player.</p>

		<a class="dac-hero-cta" href="{@docRoot}preview/index.html">
		<a class="dac-hero-cta" href="/preview/index.html">
		<span class="dac-sprite dac-auto-chevron"></span>
		Get started
		</a><br>

		<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
		<a class="dac-hero-cta" href="/preview/support.html">
		<span class="dac-sprite dac-auto-chevron"></span>
		Update to Developer Preview 2
		Update to Developer Preview 3 (final SDK)
		</a>

		</div>
		</div>
		</div>
		</div>

docs/html/preview/download.jd

+11 −8

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ This is the Android SDK Preview License Agreement (the “License Agreement”).
		<div id="qv">
		<h2>In this document</h2>
		<ol>
		<li><a href="#sdk">Developer Preview 2 SDK</a></li>
		<li><a href="#sdk">Developer Preview 3 SDK</a></li>
		<li><a href="#docs">Developer Documentation</a></li>
		<li><a href="#images">Hardware System Images</a></li>
		</ol>
		@@ -178,13 +178,13 @@ This is the Android SDK Preview License Agreement (the “License Agreement”).


		<p>
		The Android M Preview SDK includes development tools, Android system files, and library files to
		The Android M Preview SDK includes development tools, Android system images, and library files to
		help you test your app and the new APIs coming in the next release of the platform. This document
		describes how to get the downloadable components of the preview for testing your app.
		</p>


		<h2 id="sdk">Developer Preview 2 SDK</h2>
		<h2 id="sdk">Developer Preview 3 SDK</h2>

		<p>
		The Preview SDK is available for download through the <a href=
		@@ -197,7 +197,10 @@ This is the Android SDK Preview License Agreement (the “License Agreement”).
		<h2 id="docs">Developer Documentation</h2>

		<p>
		The developer documentation download package provides detailed API reference information and an API difference report for the preview.
		The developer documentation download package provides detailed API reference information and
		an API difference report for the preview. Note that <a href="{@docRoot}reference/packages.html">API
		level 23 reference</a> and <a href="{@docRoot}sdk/api_diff/23/changes.html">diffs</a> are now
		also available online.
		</p>

		<table>
		@@ -206,11 +209,11 @@ This is the Android SDK Preview License Agreement (the “License Agreement”).
		<th scope="col">Download / Checksums</th>
		</tr>
		<tr id="docs-dl">
		<td>Android M Preview 2<br>Developer Docs</td>
		<td>Android M Preview 3<br>Developer Docs</td>
		<td><a href="#top" onclick="onDownload(this)"
		>m-preview-2-developer-docs.zip</a><br>
		MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
		SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
		>m-preview-3-developer-docs.zip</a><br>
		MD5: -<br>
		SHA-1: -
		</td>
		</tr>
		<table>