diff options
| author | Scott Main <smain@google.com> | 2011-05-05 09:02:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-05 09:02:35 -0700 |
| commit | b47c18a5050c5bf652b95618912b95db16a11435 (patch) | |
| tree | 81a86ce67830ded3d2a16ea5b0fd3f4ad8442a51 /docs/html | |
| parent | ed30fd8e9a2d65ee5c8520de55b0089c219f390c (diff) | |
| parent | 4f034f70d473c8c737977898f18d54caccf99a17 (diff) | |
| download | frameworks_base-b47c18a5050c5bf652b95618912b95db16a11435.zip frameworks_base-b47c18a5050c5bf652b95618912b95db16a11435.tar.gz frameworks_base-b47c18a5050c5bf652b95618912b95db16a11435.tar.bz2 | |
am 4f034f70: am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
* commit '4f034f70d473c8c737977898f18d54caccf99a17':
docs: update homepage to announce 3.1
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/index.jd | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 78f71ac..d5f19a1 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -129,17 +129,20 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ 'sdk': { 'layout':"imgLeft", 'icon':"sdk-small.png", - 'name':"Android 3.0", + 'name':"Android 3.1", 'img':"honeycomb-android.png", - 'title':"Android 3.0 is here!", - 'desc': "<p>Android 3.0 is now available for the Android SDK. It offers a redesigned UI and " -+ "all new developer APIs for an optimized experience on tablets and similar devices. " -+ "For more information about what's in Android 3.0, read the " -+ "<a href='{@docRoot}sdk/android-3.0.html'>version notes</a>.</p>" + 'title':"Android 3.1 now available!", + 'desc': "<p>Android 3.1 includes new developer features such as APIs for USB " ++ "accessories, MTP/PTP, and RTP, as well as new input events from mice, trackballs, joysticks, " ++ "and more.</p>" ++ "<p>For more information about all the new APIs in Android 3.1, read the " ++ "<a href='{@docRoot}sdk/android-3.1.html'>version notes</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 " + "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>." +*/ }, 'tv': { @@ -152,8 +155,7 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ + "for television built on Android. Google " + "has partnered with Sony and Logitech to integrate " + "this platform into TVs, blu-ray players, and companion " - + "boxes. An add-on for the Android SDK will be " - + "available early next year. </p>" + + "boxes. </p>" + "<p><a href='http://www.google.com/tv/'>Learn more about " + "Google TV »</a></p>" }, |