diff options
| author | 2011-05-05 08:54:07 -0700 | |
|---|---|---|
| committer | 2011-05-05 08:54:07 -0700 | |
| commit | 4f034f70d473c8c737977898f18d54caccf99a17 (patch) | |
| tree | b8bf6e580a1a11e82b753e1fb6e94623b8100177 | |
| parent | 86654eda96b005ea21bfe4d29cd042187e497a8f (diff) | |
| parent | 475917c7e4002c42cdf668eabc1a04f604a82005 (diff) | |
am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
* commit '475917c7e4002c42cdf668eabc1a04f604a82005':
docs: update homepage to announce 3.1
| -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 78f71acb6ed0..d5f19a1ca9fc 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>" }, |