diff options
| author | Scott Main <smain@google.com> | 2011-10-14 04:28:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-14 04:28:05 -0700 |
| commit | 61c904fce196b6e9a369b4bb936ee65bb4aac2ac (patch) | |
| tree | d6f9950236c1c0289b1aceddac1c32f53385f5d7 | |
| parent | 0222fcc9e1f74940284dabd00f3fb7b65f9df7e6 (diff) | |
| parent | 6b1531eec06abebb0c786556e12411fbef5a0f62 (diff) | |
| download | frameworks_base-61c904fce196b6e9a369b4bb936ee65bb4aac2ac.zip frameworks_base-61c904fce196b6e9a369b4bb936ee65bb4aac2ac.tar.gz frameworks_base-61c904fce196b6e9a369b4bb936ee65bb4aac2ac.tar.bz2 | |
am 6b1531ee: Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0
* commit '6b1531eec06abebb0c786556e12411fbef5a0f62':
docs: preliminary homepage announcement (offline version)
| -rw-r--r-- | docs/html/index.jd | 11 | ||||
| -rw-r--r-- | docs/html/offline.jd | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index a8b61bf..d412993 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -129,15 +129,14 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ '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 " diff --git a/docs/html/offline.jd b/docs/html/offline.jd index 1064a99..5f8e37ce 100644 --- a/docs/html/offline.jd +++ b/docs/html/offline.jd @@ -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><sdk>/platforms/</code> directory of -your existing SDK and new add-ons are saved in the <code><sdk>/add-ons/</code> directory.</p> - <div class="note"> <p><strong>Note:</strong> You are currently viewing the offline version of the Android developer |