Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0

This commit is contained in:
Scott Main
2011-10-14 04:00:03 -07:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 10 deletions

View File

@@ -129,15 +129,14 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'sdk': {
'layout':"imgLeft",
'icon':"sdk-small.png",
'name':"Android 3.2",
'img':"honeycomb-android.png",
'title':"Android 3.2 is here!",
'desc': "<p>Android 3.2 is a minor feature update that includes new APIs that allow you to "
+ "better target your layouts for specific screen sizes and other miscellaneous new APIs.</p>"
'name':"Android 4.0",
'img':"ics-android.png",
'title':"Ice Cream Sandwich!",
'desc': "<br/><br/><br/><p>Oh my goodness, that looks tasty!</p>"
/*
+ "<p>For more information about all the changes in Android 3.2, read the "
+ "<a href='{@docRoot}sdk/android-3.2.html'>version notes</a> and <a "
+ "href='{@docRoot}sdk/api_diff/13/changes.html'>diff report</a>.</p>"
/*
+ "<p>If you have an existing SDK, add Android 3.0 as an "
+ "<a href='{@docRoot}sdk/adding-components.html'>SDK "
+ "component</a>. If you're new to Android, install the "

View File

@@ -29,7 +29,7 @@ application</li>
especially <a href="{@docRoot}resources/samples/ApiDemos/index.html">API Demos</a></li>
<li>Read the <a href="{@docRoot}guide/topics/fundamentals/index.html">Application
Fundamentals</a></li>
<li>Read the <a href="{@docRoot}guide/developing/index.html">Overview</a> for using the SDK
<li>Read the <a href="{@docRoot}guide/developing/index.html">Introduction</a> for using the SDK
tools</li>
</ul>
</div>
@@ -44,9 +44,6 @@ will help you setup your development environment.</p>
<p>There's no additional setup.</p>
<p>New Android platforms are saved in the <code>&lt;sdk>/platforms/</code> directory of
your existing SDK and new add-ons are saved in the <code>&lt;sdk>/add-ons/</code> directory.</p>
<div class="note">
<p><strong>Note:</strong> You are currently viewing the offline version of the Android developer